Skip to content

Commit

Permalink
renamed variable and ordered return of query method
Browse files Browse the repository at this point in the history
  • Loading branch information
nathandunn committed Nov 10, 2019
1 parent 5046111 commit 3040673
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,7 @@ class OrganismController {
permissionService.checkPermissions(organismJson, PermissionEnum.ADMINISTRATE)
Organism organism = Organism.findById(organismJson.id)
Boolean madeObsolete
Boolean doReloadIfOrganismChanges = organismJson.noReloadSequences ? Boolean.valueOf(organismJson.noReloadSequences as String) : false
Boolean noReloadSequencesIfOrganismChanges = organismJson.noReloadSequences ? Boolean.valueOf(organismJson.noReloadSequences as String) : false
if (organism) {
String oldOrganismDirectory = organism.directory

Expand Down Expand Up @@ -1325,7 +1325,7 @@ class OrganismController {
}
organism.save(flush: true, insert: false, failOnError: true)

if (oldOrganismDirectory!=organism.directory && !doReloadIfOrganismChanges) {
if (oldOrganismDirectory!=organism.directory && !noReloadSequencesIfOrganismChanges) {
// we need to reload
sequenceService.loadRefSeqs(organism)
}
Expand Down Expand Up @@ -1462,6 +1462,7 @@ class OrganismController {
featureLocations {
sequence {
eq('organism', organism)
order('name',"asc")
}
}
'in'('class', requestHandlingService.viewableAnnotationList)
Expand Down

0 comments on commit 3040673

Please sign in to comment.