Fix missing admin-settings.js

Remove settings property (Fixes #211)

Add file to avoid errors (Fixes #210)

Fix for deleting credential

Fix for deleting vault (fixes #212)

2 files changed, 5 insertions, 4 deletions

diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php
index 554755e7..5da657c5 100644
--- a/controller/credentialcontroller.php
+++ b/controller/credentialcontroller.php
@@ -266,8 +266,9 @@ class CredentialController extends ApiController {
 		} catch (\Exception $e) {
 			return new NotFoundJSONResponse();
 		}
-		if ($credential) {
+		if ($credential instanceof Credential) {
 			$result = $this->credentialService->deleteCredential($credential);
+			//print_r($credential);
 			$this->deleteCredentialParts($credential);
 		} else {
 			$result = false;
@@ -286,7 +287,7 @@ class CredentialController extends ApiController {
 			'', $this->userId, Activity::TYPE_ITEM_ACTION);
 		$this->sharingService->unshareCredential($credential->getGuid());
 		foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
-			$this->credentialRevisionService->deleteRevision($revision->getId(), $this->userId);
+				$this->credentialRevisionService->deleteRevision($revision['id'], $this->userId);
 		}
 	}
 
diff --git a/controller/vaultcontroller.php b/controller/vaultcontroller.php
index 8381dd63..4bd2140e 100644
--- a/controller/vaultcontroller.php
+++ b/controller/vaultcontroller.php
@@ -158,8 +158,8 @@ class VaultController extends ApiController {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function delete($vault_id) {
-		$this->vaultService->deleteVault($vault_id, $this->userId);
+	public function delete($vault_guid) {
+		$this->vaultService->deleteVault($vault_guid, $this->userId);
 		return new JSONResponse(array('ok' => true));
 	}
 }
\ No newline at end of file