From 74a3a8f45f256b83b7692366235132924b920cf5 Mon Sep 17 00:00:00 2001 From: Zhou Ji Date: Wed, 5 Jan 2022 19:44:15 -0500 Subject: [PATCH] bug fix (center page, role selection UI) --- .../gov/nih/nci/ctd2/dashboard/controller/ListController.java | 2 +- web/src/main/webapp/js/ctd2.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/gov/nih/nci/ctd2/dashboard/controller/ListController.java b/web/src/main/java/gov/nih/nci/ctd2/dashboard/controller/ListController.java index 60573210..44f47703 100644 --- a/web/src/main/java/gov/nih/nci/ctd2/dashboard/controller/ListController.java +++ b/web/src/main/java/gov/nih/nci/ctd2/dashboard/controller/ListController.java @@ -52,7 +52,7 @@ public void setMaxNumberOfEntities(Integer maxNumberOfEntities) { @RequestMapping(value="{type}", method = {RequestMethod.GET, RequestMethod.POST}, headers = "Accept=application/json") public ResponseEntity getSearchResultsInJson( @PathVariable String type, - @RequestParam("filterBy") Integer filterBy, + @RequestParam(value = "filterBy", required = false) Integer filterBy, @RequestParam(value = "getAll", required = false, defaultValue = "false") Boolean getAll ) { HttpHeaders headers = new HttpHeaders(); diff --git a/web/src/main/webapp/js/ctd2.js b/web/src/main/webapp/js/ctd2.js index 1a77f507..a9ce8b80 100644 --- a/web/src/main/webapp/js/ctd2.js +++ b/web/src/main/webapp/js/ctd2.js @@ -117,7 +117,7 @@ import ObservationView from './observation.view.js' urlRoot: BASE_URL + "get/center" }); const SubmissionCenters = Backbone.Collection.extend({ - url: BASE_URL + "list/center/?filterBy=", + url: BASE_URL + "list/center", model: SubmissionCenter }); @@ -215,7 +215,7 @@ import ObservationView from './observation.view.js' const SubjectRole = Backbone.Model.extend({}); const SubjectRoles = Backbone.Collection.extend({ - url: BASE_URL + "list/role?filterBy=", + url: BASE_URL + "list/role", model: SubjectRole });