#700 change codes for removing disabled button

AtlasOfLivingAustralia · Sep 19, 2023 · 3332259 · 3332259
1 parent dc9cc21
commit 3332259
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/grails-app/assets/javascripts/profileEditor/controllers/UserAccessController.js b/grails-app/assets/javascripts/profileEditor/controllers/UserAccessController.js
@@ -84,8 +84,8 @@ profileEditor.controller('UserAccessController', function (messageService, util,
         if (self.opus.privateCollection) {
             self.roles.push(userRole);
         } else {
-            self.roles.splice(4, 1)
-            if (form.$dirty) {
+            var hasRole_USER = self.users.find(it=>it.role === 'ROLE_USER')
+            if (form.$dirty && hasRole_USER) {
                 self.users = self.users.filter(it => it.role !== 'ROLE_USER')
                 var data = {privateCollection: self.opus.privateCollection, authorities: self.users};
                 var promise = profileService.updateUsers(self.opusId, data);
@@ -95,6 +95,7 @@ profileEditor.controller('UserAccessController', function (messageService, util,
                     messageService.alert("An error has occurred while updating user access.");
                 });
             }
+            self.roles.splice(4, 1)
         }
     };
 

diff --git a/grails-app/views/opus/_editAccessControl.gsp b/grails-app/views/opus/_editAccessControl.gsp
@@ -122,9 +122,9 @@
         <div class="row">
             <div class="col-md-12" ng-show="userCtrl.accessControlTab == 'user'">
                 <div class="btn-group">
-                    <button class="btn btn-default" ng-click="userCtrl.addUser(UserForm)" ng-disabled="!userCtrl.opus.privateCollection && UserForm.$dirty">
+                    <button class="btn btn-default" ng-click="userCtrl.addUser(UserForm)">
                         <i class="fa fa-plus"></i>  Add user</button>
-                    <button class="btn btn-default" ng-click="userCtrl.reset(UserForm)" ng-disabled="!userCtrl.opus.privateCollection && UserForm.$dirty">Reset</button>
+                    <button class="btn btn-default" ng-click="userCtrl.reset(UserForm)">Reset</button>
                 </div>
                 <save-button ng-click="userCtrl.save(UserForm)" form="UserForm"></save-button>
             </div>