nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-10-26 05:16:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

Small bugfixes

Browse source
This commit is contained in:
brantje 2016-09-30 17:44:21 +02:00
parent 93ecc59036
commit 05e20cceb0
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
5 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
js/app/controllers/edit_credential.js
View file

@ -18,24 +18,13 @@ angular.module('passmanApp')
} else {
if (SettingsService.getSetting('defaultVault') && SettingsService.getSetting('defaultVaultPass')) {
var _vault = angular.copy(SettingsService.getSetting('defaultVault'));
VaultService.getVault(_vault).then(function (vault) {
VaultService.setActiveVault(vault);
$scope.active_vault = vault;
_vault.vaultKey = angular.copy(SettingsService.getSetting('defaultVaultPass'));
VaultService.setActiveVault(_vault);
$scope.active_vault = _vault;
$scope.pwSettings = VaultService.getVaultSetting('pwSettings',
{
'length': 12,
'useUppercase': true,
'useLowercase': true,
'useDigits': true,
'useSpecialChars': true,
'minimumDigitCount': 3,
'avoidAmbiguousCharacters': false,
'requireEveryCharType': true,
'generateOnCreate': true,
})
})
//@TODO check if vault exists
}
}
$scope.tabs = [{

7
js/app/controllers/settings.js
View file

@ -8,8 +8,8 @@
* Controller of the passmanApp
*/
angular.module('passmanApp')
.controller('SettingsCtrl', ['$scope', '$rootScope', 'SettingsService', 'VaultService', 'CredentialService', '$location', '$routeParams', '$http', 'EncryptService',
function ($scope, $rootScope, SettingsService, VaultService, CredentialService, $location, $routeParams, $http, EncryptService) {
.controller('SettingsCtrl', ['$scope', '$rootScope', 'SettingsService', 'VaultService', 'CredentialService', '$location', '$routeParams', '$http', 'EncryptService','NotificationService',
function ($scope, $rootScope, SettingsService, VaultService, CredentialService, $location, $routeParams, $http, EncryptService, NotificationService) {
$scope.vault_settings = {};
$scope.active_vault = VaultService.getActiveVault();
if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
@ -34,7 +34,7 @@ angular.module('passmanApp')
'minimumDigitCount': 3,
'avoidAmbiguousCharacters': false,
'requireEveryCharType': true,
'generateOnCreate': true,
'generateOnCreate': true
})
})
}
@ -46,6 +46,7 @@ angular.module('passmanApp')
_vault.vault_settings = angular.copy($scope.vault_settings);
VaultService.updateVault(_vault).then(function () {
VaultService.setActiveVault(_vault);
NotificationService.showNotification('Settings saved', 5000);
});
};

2
js/app/services/encryptservice.js
View file

@ -34,7 +34,7 @@ angular.module('passmanApp')
} catch(e) {
throw e;
}
},
}
}
}]);

2
js/templates.js
View file

File diff suppressed because one or more lines are too long

4
templates/views/show_vault.html
View file

@ -59,7 +59,7 @@
</div>
<div off-click="closeSelected()">
<div class="loaderContainer" ng-show="show_spinner">
<div class="loaderContainer" ng-if="show_spinner">
<div class="loader" use-theme type="'border-bottom-color'"></div>
</div>
<div ng-init="menuOpen = false;">
@ -79,7 +79,7 @@
</td>
</tr>
</table>
<ul class="grid-view" ng-show="view_mode === 'grid'">
<ul class="grid-view" ng-if="view_mode === 'grid'">
<li class="credential" ng-repeat="credential in active_vault.credentials | credentialSearch:filterOptions | tagFilter:selectedtags | orderBy:'label'| as:this:'filtered_credentials'"
ng-if="credential.hidden == 0 && showCredentialRow(credential)"
ng-click="selectCredential(credential)"