fixes #2554

GMOD · Feb 3, 2021 · cc7babf · cc7babf
1 parent 93bd09e
commit cc7babf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -9,6 +9,7 @@ Features
 
 Bug Fixes:
 - Bad coordinate value in genomic element details screen in annotator panel [2559](https://github.com/GMOD/Apollo/issues/2559).
+- Web services indicated user had no organism permissions when checking the login [2554](https://github.com/GMOD/Apollo/issues/2554).
 
 Infrastructure Changes
 

diff --git a/grails-app/controllers/org/bbop/apollo/UserController.groovy b/grails-app/controllers/org/bbop/apollo/UserController.groovy
@@ -257,9 +257,12 @@ class UserController {
 
             def userObject = userService.convertUserToJson(currentUser)
 
-            if ((!userOrganismPreference || !permissionService.hasAnyPermissions(currentUser)) && !permissionService.isUserBetterOrEqualRank(currentUser, GlobalPermissionEnum.INSTRUCTOR)) {
+          // if lacks permissions and is not an instructor then there are no organisms to share
+            if (!permissionService.hasAnyPermissions(currentUser) && !permissionService.isUserBetterOrEqualRank(currentUser, GlobalPermissionEnum.INSTRUCTOR)) {
                 userObject.put(FeatureStringEnum.ERROR.value, "You do not have access to any organism on this server.  Please contact your administrator.")
-            } else if (userOrganismPreference) {
+            }
+
+            if (userOrganismPreference) {
                 userObject.put("tracklist", userOrganismPreference.nativeTrackList)
             }