#785_2 fix

AtlasOfLivingAustralia · Nov 14, 2023 · 415134c · 415134c
1 parent 114dee4
commit 415134c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/grails-app/controllers/au/org/ala/profile/api/ApiController.groovy b/grails-app/controllers/au/org/ala/profile/api/ApiController.groovy
@@ -620,6 +620,7 @@ class ApiController extends BaseController {
     )
 
     def getLocalImage() {
+        params.imageId = params.fileName
         forward controller: "profile", action: "getLocalImage"
     }
 
@@ -694,6 +695,7 @@ class ApiController extends BaseController {
     )
 
     def retrieveLocalThumbnailImage () {
+        params.imageId = params.fileName
         forward controller: "profile", action: "retrieveLocalThumbnailImage"
     }
 

diff --git a/grails-app/controllers/au/org/ala/profile/hub/ProfileController.groovy b/grails-app/controllers/au/org/ala/profile/hub/ProfileController.groovy
@@ -409,9 +409,9 @@ class ProfileController extends BaseController {
                 ImageType type = params.type as ImageType
                 //NB this imageId param already has the file extension on it, really the file name on disk
                 if (type == ImageType.STAGED) {
-                    displayLocalImage("${grailsApplication.config.image.staging.dir}/", params.opusId, params.profileId, params.fileName, true)
+                    displayLocalImage("${grailsApplication.config.image.staging.dir}/", params.opusId, params.profileId, params.imageId, true)
                 } else if (type == ImageType.PRIVATE) {
-                    displayLocalImage("${grailsApplication.config.image.private.dir}/", params.opusId, params.profileId, params.fileName, true)
+                    displayLocalImage("${grailsApplication.config.image.private.dir}/", params.opusId, params.profileId, params.imageId, true)
                 }
             } catch (IllegalArgumentException e) {
                 log.warn(e)
@@ -428,9 +428,9 @@ class ProfileController extends BaseController {
                 ImageType type = params.type as ImageType
                 //NB this imageId param already has the file extension on it, really the file name on disk
                 if (type == ImageType.STAGED) {
-                    displayLocalImage("${grailsApplication.config.image.staging.dir}/", params.opusId, params.profileId, params.fileName, false)
+                    displayLocalImage("${grailsApplication.config.image.staging.dir}/", params.opusId, params.profileId, params.imageId, false)
                 } else if (type == ImageType.PRIVATE) {
-                    displayLocalImage("${grailsApplication.config.image.private.dir}/", params.opusId, params.profileId, params.fileName, false)
+                    displayLocalImage("${grailsApplication.config.image.private.dir}/", params.opusId, params.profileId, params.imageId, false)
                 }
             } catch (IllegalArgumentException e) {
                 log.warn(e)