DEV-8113 add options to hide CreatedAt and LastLogin fields; update b…

…uild script (#18)
drivevelocity · Jul 31, 2020 · b6ad9c9 · b6ad9c9
1 parent 8ed1573
commit b6ad9c9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -4,7 +4,7 @@ on:
   release:
     types: [published]
   pull_request:
-    branches: '**'
+    branches: 'develop'
   push:
     branches:
       - develop

diff --git a/app/authorization/server/startup.js b/app/authorization/server/startup.js
@@ -72,6 +72,8 @@ Meteor.startup(function() {
 		{ _id: 'user-generate-access-token',    roles: ['admin'] },
 		{ _id: 'view-d-room',                   roles: ['admin', 'user', 'bot', 'app', 'guest'] },
 		{ _id: 'view-full-other-user-info',     roles: ['admin'] },
+		{ _id: 'view-full-other-user-info_last_login', roles: ['admin'] },
+		{ _id: 'view-full-other-user-info_created_at', roles: ['admin'] },
 		{ _id: 'view-history',                  roles: ['admin', 'user', 'anonymous'] },
 		{ _id: 'view-joined-room',              roles: ['guest', 'bot', 'app', 'anonymous'] },
 		{ _id: 'view-join-code',                roles: ['admin'] },

diff --git a/app/ui-flextab/client/tabs/userInfo.html b/app/ui-flextab/client/tabs/userInfo.html
@@ -81,14 +81,18 @@ <h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i
 									</div>
 								{{/if}}
 								{{#if createdAt}}
-									<div class="rc-user-info-details__item">
-										<label class="rc-user-info-details__label">{{_ "Created_at"}}</label>
-										<p class="rc-user-info-details__info">{{createdAt}}</p>
-									</div>
-									<div class="rc-user-info-details__item">
-										<label class="rc-user-info-details__label">{{_ "Last_login"}}</label>
-										<p class="rc-user-info-details__info">{{lastLogin}}</p>
-									</div>
+									{{#if hasPermission 'view-full-other-user-info_created_at'}}
+										<div class="rc-user-info-details__item">
+												<label class="rc-user-info-details__label">{{_ "Created_at"}}</label>
+												<p class="rc-user-info-details__info">{{createdAt}}</p>
+											</div>
+									{{/if}}
+									{{#if hasPermission 'view-full-other-user-info_last_login'}}
+										<div class="rc-user-info-details__item">
+											<label class="rc-user-info-details__label">{{_ "Last_login"}}</label>
+											<p class="rc-user-info-details__info">{{lastLogin}}</p>
+										</div>
+									{{/if}}
 								{{/if}}
 								{{#if shouldDisplayReason}}
 									<div class="rc-user-info-details__item">

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3620,6 +3620,8 @@
   "view-d-room": "View Direct Messages",
   "view-d-room_description": "Permission to view direct messages",
   "view-full-other-user-info": "View Full Other User Info",
+  "view-full-other-user-info_created_at": "View Created At field",
+  "view-full-other-user-info_last_login": "View Last Login field",
   "view-full-other-user-info_description": "Permission to view full profile of other users including account creation date, last login, etc.",
   "view-history": "View History",
   "view-history_description": "Permission to view the channel history",