From d14b0b0b5e1b34dd9a407295247f7015d2728967 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 26 Jan 2017 12:48:21 -0500
Subject: [PATCH] (js) Improve ACLs handling of inactive users

---
 NEWS                                                  |  9 +++++++++
 .../AdministrationUI/UIxAdministrationAclEditor.wox   |  6 +++---
 UI/Templates/UIxAclEditor.wox                         |  6 +++---
 .../js/Administration/AdministrationAclController.js  |  5 +++++
 UI/WebServerResources/js/Common/AclController.js      |  5 +++++
 UI/WebServerResources/js/Common/User.service.js       | 11 ++++++++++-
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 73b834ad7..5987fda3b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+3.2.7 (2017-01-DD)
+------------------
+
+Enhancements
+ - [web] improved ACLs handling of inactive users
+
+Bug fixes
+ - [core] fixed "include in freebusy" (reverts #3354)
+
 3.2.6 (2017-01-23)
 ------------------
 
diff --git a/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox b/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
index 1fa3430bb..69c3bf38f 100644
--- a/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
+++ b/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
@@ -80,12 +80,12 @@
                                  size="40">{{ user.$avatarIcon }}</sg-avatar-image>
               </span>
               <div class="sg-tile-content">
-                <div class="sg-md-subhead"><div>{{user.cn}}</div></div>
+                <div class="sg-md-subhead"><div>{{user.$fullname()}}</div></div>
                 <div class="sg-md-body"><div>{{user.c_email}}</div></div>
               </div>
 	      <md-button class="md-icon-button md-secondary" type="button"
                          ng-click="acl.selectAllRights(user)"
-                         ng-hide="user.uid != acl.selectedUid || user.$isSpecial()">
+                         ng-hide="!acl.showRights(user) || user.$isSpecial()">
                 <md-icon>select_all</md-icon>
               </md-button>
               <md-button class="md-icon-button" type="button"
@@ -95,7 +95,7 @@
               </md-button>
             </div>
           </a>
-          <md-card-content id="AccessRightList" ng-show="user.uid == acl.selectedUid">
+          <md-card-content id="AccessRightList" ng-show="acl.showRights(user)">
             <var:if condition="canSubscribeUsers">
               <md-checkbox ng-model="user.isSubscribed"
                            label:arial-label="Subscribe User"
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 21b8727a7..3868c4a0b 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -57,12 +57,12 @@
                                size="40">{{ user.$avatarIcon }}</sg-avatar-image>
             </div>
             <div class="sg-tile-content">
-              <div class="sg-md-subhead"><div>{{user.cn}}</div></div>
+              <div class="sg-md-subhead"><div>{{user.$fullname()}}</div></div>
               <div class="sg-md-body"><div>{{user.c_email}}</div></div>
             </div>
 	    <md-button class="md-icon-button md-secondary" type="button"
                        ng-click="acl.selectAllRights(user)"
-                       ng-hide="user.uid != acl.selectedUid || user.$isSpecial()">
+                       ng-hide="!acl.showRights(user) || user.$isSpecial()">
               <md-icon>select_all</md-icon>
             </md-button>
             <md-button class="md-icon-button" type="button"
@@ -72,7 +72,7 @@
             </md-button>
           </div>
         </a>
-        <md-card-content id="AccessRightList" ng-show="user.uid == acl.selectedUid">
+        <md-card-content id="AccessRightList" ng-show="acl.showRights(user)">
           <var:if condition="canSubscribeUsers">
             <md-checkbox ng-model="user.isSubscribed"
                          label:arial-label="Subscribe User"
diff --git a/UI/WebServerResources/js/Administration/AdministrationAclController.js b/UI/WebServerResources/js/Administration/AdministrationAclController.js
index 0b1a23fda..3049005c5 100644
--- a/UI/WebServerResources/js/Administration/AdministrationAclController.js
+++ b/UI/WebServerResources/js/Administration/AdministrationAclController.js
@@ -18,6 +18,7 @@
     vm.selectedUid = null;
     vm.selectUser = selectUser;
     vm.selectAllRights = selectAllRights;
+    vm.showRights = showRights;
     vm.removeUser = removeUser;
     vm.getTemplate = getTemplate;
     vm.close = close;
@@ -56,6 +57,10 @@
       }
     }
 
+    function showRights(user) {
+      return vm.selectedUid == user.uid && user.rights;
+    }
+
     function userFilter($query) {
       return User.$filter($query, stateFolder.$acl.users, { dry: true, uid: vm.user.uid });
     }
diff --git a/UI/WebServerResources/js/Common/AclController.js b/UI/WebServerResources/js/Common/AclController.js
index babbe54f4..bb0d3ccb2 100644
--- a/UI/WebServerResources/js/Common/AclController.js
+++ b/UI/WebServerResources/js/Common/AclController.js
@@ -24,6 +24,7 @@
     vm.addUser = addUser;
     vm.selectAllRights = selectAllRights;
     vm.selectUser = selectUser;
+    vm.showRights = showRights;
     vm.confirmation = { showing: false,
                         message: ''};
 
@@ -86,6 +87,10 @@
         vm.selectedUser.$rights();
       }
     }
+
+    function showRights(user) {
+      return vm.selectedUid == user.uid && user.rights;
+    }
   }
 
   angular
diff --git a/UI/WebServerResources/js/Common/User.service.js b/UI/WebServerResources/js/Common/User.service.js
index 7d9a27544..5d9d860da 100644
--- a/UI/WebServerResources/js/Common/User.service.js
+++ b/UI/WebServerResources/js/Common/User.service.js
@@ -125,13 +125,22 @@
     this.empty = ' ';
   };
 
+  /**
+   * @function $fullname
+   * @memberof User.prototype
+   * @return a string representing the fullname
+   */
+  User.prototype.$fullname = function() {
+    return this.cn || this.uid;
+  };
+
   /**
    * @function $shortFormat
    * @memberof User.prototype
    * @return the fullname along with the email address
    */
   User.prototype.$shortFormat = function(options) {
-    var fullname = this.cn || this.c_email;
+    var fullname = this.$fullname();
     var email = this.c_email;
     var no_email = options && options.email === false;
     if (!no_email && email && fullname != email) {