amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-16 08:55:24 +00:00
Code Issues Projects Releases Wiki Activity

Refactor acl object and applied comments

Browse Source
This commit is contained in:
Alexandre Cloutier
2014-10-17 11:01:56 -04:00
committed by Francis Lachapelle
parent b4128f97a6
commit bc19f910f6
9 changed files with 259 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Common/acl-model.js
+19 -18
View File
@@ -1,50 +1,51 @@
(function() {
'use strict';
function AclUsers(folder) {
this.folder_id = folder.id;
function Acl(folder_id) {
this.folder_id = folder_id;
}
/* The factory we'll use to register with Angular */
AclUsers.factory = ['$q', '$timeout', 'sgSettings', 'sgResource', function($q, $timeout, Settings, Resource) {
angular.extend(AclUsers, {
$q: $q,
$timeout: $timeout,
Acl.factory = ['sgSettings', 'sgResource', function(Settings, Resource) {
angular.extend(Acl, {
$$resource: new Resource(Settings.baseURL)
});
return AclUsers; // return constructor
return Acl; // return constructor
}];
/* Factory registration in Angular module */
angular.module('SOGo.Common').factory('sgAclUsers', AclUsers.factory);
angular.module('SOGo.Common').factory('sgAcl', Acl.factory);
/* Instance methods
* Public method, assigned to prototype
*/
AclUsers.prototype.userRights = function(uid) {
Acl.prototype.$userRights = function(uid) {
var param = {"uid": uid};
return AclUsers.$$resource.fetch(this.folder_id, "userRights", param);
return Acl.$$resource.fetch(this.folder_id, "userRights", param);
};
AclUsers.prototype.addUser = function(uid) {
Acl.prototype.$addUser = function(uid) {
var param = {"uid": uid};
AclUsers.$$resource.fetch(this.folder_id, "addUserInAcls", param);
Acl.$$resource.fetch(this.folder_id, "addUserInAcls", param);
};
AclUsers.prototype.removeUser = function(uid) {
Acl.prototype.$removeUser = function(uid) {
var param = {"uid": uid};
AclUsers.$$resource.fetch(this.folder_id, "removeUserFromAcls", param);
Acl.$$resource.fetch(this.folder_id, "removeUserFromAcls", param);
};
AclUsers.prototype.saveUsersRights = function(dirtyObjects) {
Acl.prototype.$saveUsersRights = function(dirtyObjects) {
var param = {"action": "saveUserRights"};
AclUsers.$$resource.save(this.folder_id, dirtyObjects, param);
Acl.$$resource.save(this.folder_id, dirtyObjects, param);
};
AclUsers.prototype.subscribeUsers = function(uids) {
Acl.prototype.$subscribeUsers = function(uids) {
var param = {"uids": uids};
AclUsers.$$resource.fetch(this.folder_id, "subscribeUsers", param);
Acl.$$resource.fetch(this.folder_id, "subscribeUsers", param);
};
Acl.prototype.$users = function() {
return Acl.$$resource.fetch(this.folder_id, "acls");
};
})();
UI/WebServerResources/js/Common/resource.js
+3 -5
View File
@@ -117,11 +117,9 @@
* @param {Object} params - Object parameters injected through the $http protocol
*/
Resource.prototype.fetch = function(folder_id, action, params) {
var deferred = this._q.defer();
var folder_id_path = folder_id ? ("/" + folder_id) : "";
var action_path = action ? ("/" + action) : "";
var path = this._path + folder_id_path + action_path;
var deferred = this._q.defer(),
path = [this._path, (folder_id ? folder_id : ""), (action ? action : "")];
path = _.compact(path).join("/");
this._http({
method: 'GET',