From dca12aee07f1b77a4697c78a1dd5d40f66a88e54 Mon Sep 17 00:00:00 2001
From: brantje <brantje@gmail.com>
Date: Fri, 17 Feb 2017 22:46:45 +0100
Subject: [PATCH] Fix Call to a member function getId() on array (Fixes #252)

---
 controller/credentialcontroller.php |  2 +-
 js/app/controllers/credential.js    | 28 ++++++++--------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php
index 1b116b64..1989905e 100644
--- a/controller/credentialcontroller.php
+++ b/controller/credentialcontroller.php
@@ -292,7 +292,7 @@ class CredentialController extends ApiController {
 			'', $this->userId, Activity::TYPE_ITEM_ACTION);
 		$this->sharingService->unshareCredential($credential->getGuid());
 		foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
-				$id = $revision->getId();
+				$id = $revision['revision_id'];
 				if(isset($id)){
 					$this->credentialRevisionService->deleteRevision($id, $this->userId);
 				}
diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index ec510943..42af3209 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -262,17 +262,10 @@
 					if (notification) {
 						NotificationService.hideNotification(notification);
 					}
-					notification = NotificationService.showNotification($translate.instant('credential.deleted'), 5000,
-						function () {
-							var key = CredentialService.getSharedKeyFromCredential(_credential);
-							CredentialService.updateCredential(_credential, false, key).then(function (result) {
-								if (result.delete_time > 0) {
-									notification = false;
-
-								}
-							});
-						});
-
+					var key = CredentialService.getSharedKeyFromCredential(_credential);
+					CredentialService.updateCredential(_credential, false, key).then(function (result) {
+						notification = NotificationService.showNotification($translate.instant('credential.deleted'), 5000);
+					});
 				};
 
 				$scope.recoverCredential = function (credential) {
@@ -292,15 +285,10 @@
 					if (notification) {
 						NotificationService.hideNotification(notification);
 					}
-					NotificationService.showNotification($translate.instant('credential.recovered'), 5000,
-						function () {
-							var key = CredentialService.getSharedKeyFromCredential(_credential);
-							CredentialService.updateCredential(_credential, false, key).then(function () {
-								notification = false;
-
-							});
-						});
-
+					var key = CredentialService.getSharedKeyFromCredential(_credential);
+					CredentialService.updateCredential(_credential, false, key).then(function () {
+						NotificationService.showNotification($translate.instant('credential.recovered'), 5000);
+					});
 				};
 
 				$scope.destroyCredential = function (credential) {