From 451d9134428eaa5b0c322153ce08f02bcf3161a5 Mon Sep 17 00:00:00 2001
From: jendib <benjamin.gam@gmail.com>
Date: Sun, 10 May 2015 13:12:23 +0200
Subject: [PATCH] Simplify adding READ+WRITE ACL

---
 .../src/app/docs/controller/DocumentView.js   | 46 ++++++++++++++-----
 .../src/partial/docs/document.view.html       |  4 +-
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentView.js b/docs-web/src/main/webapp/src/app/docs/controller/DocumentView.js
index 18d50e78..3bd93077 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/DocumentView.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/DocumentView.js
@@ -151,7 +151,6 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta
 
   /**
    * File has been drag & dropped.
-   * @param files
    */
   $scope.fileDropped = function(files) {
     if (!$scope.document.writable) {
@@ -186,8 +185,6 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta
 
   /**
    * Upload a file.
-   * @param file
-   * @param newfile
    */
   $scope.uploadFile = function(file, newfile) {
     // Upload the file
@@ -210,7 +207,6 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta
 
   /**
    * Delete an ACL.
-   * @param acl
    */
   $scope.deleteAcl = function(acl) {
     Restangular.one('acl/' + $stateParams.id + '/' + acl.perm + '/' + acl.id, null).remove().then(function () {
@@ -224,17 +220,45 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta
    * Add an ACL.
    */
   $scope.addAcl = function() {
+    // Compute ACLs to add
     $scope.acl.source = $stateParams.id;
-    Restangular.one('acl').put($scope.acl).then(function(acl) {
-      $scope.acl = { perm: 'READ' };
-      if (_.isUndefined(acl.id)) {
-        return;
-      }
-      $scope.document.acls.push(acl);
-      $scope.document.acls = angular.copy($scope.document.acls);
+    var acls = [];
+    if ($scope.acl.perm == 'READWRITE') {
+      acls = [{
+        source: $stateParams.id,
+        username: $scope.acl.username,
+        perm: 'READ'
+      }, {
+        source: $stateParams.id,
+        username: $scope.acl.username,
+        perm: 'WRITE'
+      }];
+    } else {
+      acls = [{
+        source: $stateParams.id,
+        username: $scope.acl.username,
+        perm: $scope.acl.perm
+      }];
+    }
+
+    // Add ACLs
+    _.each(acls, function(acl) {
+      Restangular.one('acl').put(acl).then(function(acl) {
+        if (_.isUndefined(acl.id)) {
+          return;
+        }
+        $scope.document.acls.push(acl);
+        $scope.document.acls = angular.copy($scope.document.acls);
+      });
     });
+
+    // Reset form
+    $scope.acl = { perm: 'READ' };
   };
 
+  /**
+   * Auto-complete on ACL target.
+   */
   $scope.getTargetAclTypeahead = function($viewValue) {
     var deferred = $q.defer();
     Restangular.one('acl/target/search')
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html
index 691e909a..7975ec1b 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.view.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html
@@ -118,8 +118,8 @@
             <label class=" col-sm-2 control-label" for="inputPermission">Permission</label>
             <div class="col-sm-3">
               <select class="form-control" ng-model="acl.perm" id="inputPermission">
-                <option value="READ">Read</option>
-                <option value="WRITE">Write</option>
+                <option value="READ">Can read</option>
+                <option value="READWRITE">Can edit</option>
               </select>
             </div>
           </div>