LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add dialog window for public and allusers access

pull/91/head
Alexandre Cloutier 2014-10-08 15:14:15 -04:00 committed by Francis Lachapelle
parent df3ad5445c
commit 4e8d3ce900
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/WebServerResources/GNUmakefile
View File

@ -6,9 +6,9 @@ WEBSERVER_RESOURCE_DIRS = css fonts img js
build-static-files:
@if [ -d bower_components ]; then \
bower update; \
bower update --allow-root; \
else \
bower install; \
bower install --allow-root; \
fi
( cd bower_components/underscore/ && npm run-script build )
grunt build

34
UI/WebServerResources/js/ContactsUI.js
View File

@ -197,9 +197,39 @@
};
$scope.saveModal = function() {
if(!_.isEmpty(dirtyObjects)) {
$scope.AclUsers.saveUsersRights(dirtyObjects);
if(dirtyObjects["anonymous"])
{
Dialog.confirm(l("Warning"), l("Any user with an account on this system will be able to access your folder. Are you certain you trust them all?")).then(function(res){
if(res){
$scope.AclUsers.saveUsersRights(dirtyObjects);
$modalInstance.close();
};
})
}
else if (dirtyObjects["<default>"]) {
Dialog.confirm(l("Warning"), l("Potentially anyone on the Internet will be able to access your folder, even if they do not have an account on this system. Is this information suitable for the public Internet?")).then(function(res){
if(res){
$scope.AclUsers.saveUsersRights(dirtyObjects);
$modalInstance.close();
};
})
}
else {
$scope.AclUsers.saveUsersRights(dirtyObjects);
var usersToSubscribe = [];
angular.forEach(dirtyObjects, function(dirtyObject){
if(dirtyObject.canSubscribeUser && dirtyObject.isSubscribed){
usersToSubscribe.push(dirtyObject.uid);
}
})
if(!_.isEmpty(usersToSubscribe))
$scope.AclUsers.subscribeUsers(usersToSubscribe);
$modalInstance.close();
}
}
$modalInstance.close();
else
$scope.$aclEditorModal.remove();
};
$scope.removeUser = function() {
if (!_.isEmpty($scope.userSelected)) {