Skip to content

Commit 4ddc279

Browse files
committed
commit progress update #1659
1 parent 2cc3859 commit 4ddc279

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

grails-app/controllers/au/org/ala/biocollect/BioActivityController.groovy

+8-2
Original file line numberDiff line numberDiff line change
@@ -1860,7 +1860,7 @@ class BioActivityController {
18601860
],
18611861
security = @SecurityRequirement(name="auth")
18621862
)
1863-
@Path("ws/bioactivity/data/simplified/{id}/{includeSiteData}")
1863+
@Path("ws/bioactivity/data/simplified/{id}")
18641864
def getOutputForActivitySimplified(String id, boolean includeSiteData){
18651865
log.debug("id = ${id}")
18661866
log.debug("includeSiteData = ${includeSiteData}")
@@ -1882,7 +1882,13 @@ class BioActivityController {
18821882
} else if (projectService.isUserAdminForProject(userId, projectId) || activityService.isUserOwnerForActivity(userId, activity?.activityId)) {
18831883
model = [activity: activity]
18841884
if (includeSiteData) {
1885-
model.site = model.activity?.siteId ? siteService.get(model.activity.siteId, [view:'brief']) : null
1885+
model.site = siteService.get(activity.siteId).collect {
1886+
[
1887+
siteId: it.siteId,
1888+
name : it.name,
1889+
geoJson: it.geoIndex
1890+
]
1891+
}
18861892
}
18871893

18881894
} else {

0 commit comments

Comments
 (0)