Skip to content

Commit 72c19c5

Browse files
Fix: see/add users in the UI when no organism
1 parent 1b2b9db commit 72c19c5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

grails-app/services/org/bbop/apollo/PermissionService.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ class PermissionService {
624624
organism = organism ?: preferenceService.getCurrentOrganismPreferenceInDB(clientToken)?.organism
625625
}
626626
// don't set the preferences if it is coming off a script
627-
if (clientToken != FeatureStringEnum.IGNORE.value) {
627+
if (clientToken != FeatureStringEnum.IGNORE.value && organism) {
628628
preferenceService.setCurrentOrganism(getCurrentUser(), organism, clientToken)
629629
}
630630
if(organism){

grails-app/services/org/bbop/apollo/PreferenceService.groovy

+2-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,8 @@ class PreferenceService {
700700
organism = Organism.first()
701701
}
702702
if (!organism) {
703-
throw new PermissionException("User does not have permission for any organisms.")
703+
log.warn("Not able to get organism preference")
704+
return null
704705
}
705706

706707
// sequence = sequence ?: Sequence.findByOrganism(organism, [sort: "end", order: "desc", max: 1])

0 commit comments

Comments
 (0)