apply the sort order (#4214)

obiba · Aug 27, 2021 · ecb978f · ecb978f
1 parent 9a9edbd
commit ecb978f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mica-webapp/src/main/java/org/obiba/mica/web/controller/NetworkController.java b/mica-webapp/src/main/java/org/obiba/mica/web/controller/NetworkController.java
@@ -78,7 +78,7 @@ public ModelAndView network(@PathVariable String id, @RequestParam(value = "draf
     }
 
     Map<String, List<Membership>> membershipMap = personService.getNetworkMembershipMap(network.getId());
-    params.put("memberships", membershipMap);
+    params.put("memberships", personService.setMembershipOrder(network.getMembershipSortOrder(), membershipMap));
 
     return new ModelAndView("network", params);
   }

diff --git a/mica-webapp/src/main/java/org/obiba/mica/web/controller/StudyController.java b/mica-webapp/src/main/java/org/obiba/mica/web/controller/StudyController.java
@@ -66,7 +66,7 @@ private BaseStudy getStudy(String id, String shareKey) {
       study = draftStudyService.findStudy(id);
       if (study == null) throw NoSuchStudyException.withId(id);
       checkPermission("/draft/" + ((study instanceof Study) ? "individual-study" : "harmonization-study"), "VIEW", id, shareKey);
-      study.setMemberships(personService.getStudyMembershipMap(id));
+      study.setMemberships(personService.setMembershipOrder(study.getMembershipSortOrder(), personService.getStudyMembershipMap(id)));
     }
     return study;
   }