nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2024-11-10 17:27:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix for unsharing password

Browse source
This commit is contained in:
brantje 2016-10-04 12:57:41 +02:00
parent 04a89a3ea3
commit e71a82218e
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controller/credentialcontroller.php
View file

@ -127,7 +127,7 @@ class CredentialController extends ApiController {
'delete_time' => $delete_time, 'delete_time' => $delete_time,
'hidden' => $hidden, 'hidden' => $hidden,
'otp' => $otp, 'otp' => $otp,
'shared_key' => $shared_key, 'shared_key' => ($shared_key === NULL) ? '' : $shared_key,
); );

2
js/templates.js
View file

@ -89,7 +89,7 @@ angular.module('views/partials/forms/share_credential/basics.html', []).run(['$t
angular.module('views/partials/forms/share_credential/link_sharing.html', []).run(['$templateCache', function($templateCache) { angular.module('views/partials/forms/share_credential/link_sharing.html', []).run(['$templateCache', function($templateCache) {
'use strict'; 'use strict';
$templateCache.put('views/partials/forms/share_credential/link_sharing.html', $templateCache.put('views/partials/forms/share_credential/link_sharing.html',
'<div class="row"><div class="col-xs-12 col-md-6"><input type="checkbox" ng-model="share_settings.linkSharing.enabled"> Enable link sharing.<br><input type="text" ng-model="share_link" select-on-click ng-if="share_settings.linkSharing.enabled"><div ng-show="share_settings.linkSharing.enabled">Share until date <span datetime-picker ng-model="share_settings.linkSharing.settings.expire_time" class="link" future-only close-on-select="false">No expire date set</span></div><div ng-show="share_settings.linkSharing.enabled">Share until views <input type="number" ng-model="share_settings.linkSharing.settings.expire_views"></div><div ng-if="share_settings.linkSharing.enabled"><table><tr><td><input type="checkbox" ng-click="setPermission(share_settings.linkSharing.settings.acl, default_permissions.permissions.FILES)" ng-checked="hasPermission(share_settings.linkSharing.settings.acl, default_permissions.permissions.FILES)"></td><td>Show files</td></tr></table></div></div></div>'); '<div class="row"><div class="col-xs-12 col-md-6"><input type="checkbox" ng-model="share_settings.linkSharing.enabled"> Enable link sharing.<br><input type="text" ng-model="share_link" select-on-click placeholder="Click share first!" ng-if="share_settings.linkSharing.enabled"><div ng-show="share_settings.linkSharing.enabled">Share until date <span datetime-picker ng-model="share_settings.linkSharing.settings.expire_time" class="link" future-only close-on-select="false">No expire date set</span></div><div ng-show="share_settings.linkSharing.enabled">Share until views <input type="number" ng-model="share_settings.linkSharing.settings.expire_views"></div><div ng-if="share_settings.linkSharing.enabled"><table><tr><td><input type="checkbox" ng-click="setPermission(share_settings.linkSharing.settings.acl, default_permissions.permissions.FILES)" ng-checked="hasPermission(share_settings.linkSharing.settings.acl, default_permissions.permissions.FILES)"></td><td>Show files</td></tr></table></div></div></div>');
}]); }]);
angular.module('views/partials/password-meter.html', []).run(['$templateCache', function($templateCache) { angular.module('views/partials/password-meter.html', []).run(['$templateCache', function($templateCache) {

1
lib/Db/CredentialMapper.php
View file

@ -124,7 +124,6 @@ class CredentialMapper extends Mapper {
$credential->setHidden($raw_credential['hidden']); $credential->setHidden($raw_credential['hidden']);
$credential->setDeleteTime($raw_credential['delete_time']); $credential->setDeleteTime($raw_credential['delete_time']);
$credential->setSharedKey($raw_credential['shared_key']); $credential->setSharedKey($raw_credential['shared_key']);
var_dump($credential);
return parent::update($credential); return parent::update($credential);
} }

2
templates/views/partials/forms/share_credential/link_sharing.html
View file

@ -2,7 +2,7 @@
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<input type="checkbox" ng-model="share_settings.linkSharing.enabled"> <input type="checkbox" ng-model="share_settings.linkSharing.enabled">
Enable link sharing.<br/> Enable link sharing.<br/>
<input type="text" ng-model="share_link" select-on-click <input type="text" ng-model="share_link" select-on-click placeholder="Click share first!"
ng-if="share_settings.linkSharing.enabled"> ng-if="share_settings.linkSharing.enabled">
<div ng-show="share_settings.linkSharing.enabled"> <div ng-show="share_settings.linkSharing.enabled">
Share until date Share until date