SAK-31820 Fix roster display of roster group (sakaiproject#3466)

Roster groups where being shown regardless of what the permission was. This was fixed.
UHaooooo · Nov 29, 2016 · fb4e4bc · fb4e4bc
1 parent bf00bfe
commit fb4e4bc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/roster2/src/handlebars/members.handlebars b/roster2/src/handlebars/members.handlebars
@@ -66,7 +66,7 @@
                 {{/if}}
             {{/if}}
 
-            {{#if hasGroups}}
+            {{#if ../viewGroup}}
             <div class="roster-table-row">
                 <div class="roster-table-cell">{{translate 'groups'}}</div>
                 <div class="roster-table-cell">

diff --git a/roster2/src/handlebars/overview.handlebars b/roster2/src/handlebars/overview.handlebars
@@ -4,6 +4,7 @@
 
 <div class="row">
     <div class="form-group col-sm-6">
+        {{#if viewGroup}}
         <label for="roster-groups-selector-top" class="form-control-label col-sm-3">{{translate 'groups'}}</label>
         <div class="col-sm-4">
             <select id="roster-groups-selector-top">
@@ -13,6 +14,7 @@
                 {{/each}}
             </select>
         </div>
+        {{/if}}
     </div>
     <div class="form-group col-sm-6">        
             <label for="roster-roles-selector" class="form-control-label col-sm-2">{{translate 'roles_label'}}</label>

diff --git a/roster2/src/webapp/js/roster.js b/roster2/src/webapp/js/roster.js
@@ -522,6 +522,7 @@
                 'viewEmail': roster.viewEmail,
                 'viewUserDisplayId': roster.viewUserDisplayId,
                 'viewProfile': roster.currentUserPermissions.viewProfile,
+                'viewGroup' : roster.currentUserPermissions.viewGroup,
                 'viewPicture': true,
                 'currentUserId': roster.userId,
                 'viewOfficialPhoto': roster.currentUserPermissions.viewOfficialPhoto,