nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-11-11 14:41:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #74 from nextcloud/cleanUp

Browse source 
Clean up
This commit is contained in:
Sander 2016-10-08 15:06:01 +02:00 • committed by GitHub
commit 386465cd51
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
appinfo/autoload.php
View file

@ -11,9 +11,4 @@
namespace OCA\Passman\AppInfo; namespace OCA\Passman\AppInfo;
use OCP\AppFramework\App;
/**
* Additional autoloader registration, e.g. registering composer autoloaders
*/
// require_once __DIR__ . '/../vendor/autoload.php';

7
controller/credentialcontroller.php
View file

@ -145,7 +145,6 @@ class CredentialController extends ApiController {
} }
} }
$link = ''; // @TODO create direct link to credential $link = ''; // @TODO create direct link to credential
$activity = false;
if ($revision_created) { if ($revision_created) {
$activity = 'item_apply_revision'; $activity = 'item_apply_revision';
$this->activityService->add( $this->activityService->add(
@ -182,9 +181,9 @@ class CredentialController extends ApiController {
try { try {
$acl_list = $this->sharingService->getCredentialAclList($storedCredential->getGuid()); $acl_list = $this->sharingService->getCredentialAclList($storedCredential->getGuid());
} catch (DoesNotExistException $exception) { } catch (DoesNotExistException $exception) {
// Just check if we have an acl list
} }
if ($acl_list) { if (!empty($acl_list)) {
$params = array(); $params = array();
switch ($activity) { switch ($activity) {
case 'item_recovered': case 'item_recovered':
@ -293,7 +292,7 @@ class CredentialController extends ApiController {
public function updateRevision($credential_guid, $revision_id, $credential_data){ public function updateRevision($credential_guid, $revision_id, $credential_data){
$revision = null; $revision = null;
try { try {
$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId); $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
} catch (DoesNotExistException $e) { } catch (DoesNotExistException $e) {
return new NotFoundJSONResponse(); return new NotFoundJSONResponse();
} }

2
lib/Db/CredentialMapper.php
View file

@ -128,7 +128,7 @@ class CredentialMapper extends Mapper {
} }
public function deleteCredential(Credential $credential){ public function deleteCredential(Credential $credential){
$this->delete($credential); return $this->delete($credential);
} }
public function upd(Credential $credential){ public function upd(Credential $credential){

2
lib/Db/CredentialRevisionMapper.php
View file

@ -69,6 +69,6 @@ class CredentialRevisionMapper extends Mapper {
$revision = new CredentialRevision(); $revision = new CredentialRevision();
$revision->setId($revision_id); $revision->setId($revision_id);
$revision->setUserId($user_id); $revision->setUserId($user_id);
$this->delete($revision); return $this->delete($revision);
} }
} }