Changeset 3527

Timestamp:

Oct 5, 2015, 9:40:18 AM (7 years ago)

Author:

olle

Message:

Refs #801. Refs #816. Roles MeludiRole.LIBRARY_PREP and MeludiRole.LIBRARY_PLATE_DESIGNER used in library preparation are installed (they were previously defined in data access object Annotationtype.java in src/net/sf/basedb/meludi/dao/):

1. Java servlet class/file InstallServlet.java in src/net/sf/basedb/meludi/servlet/ updated in protected method void doGet(HttpServletRequest req, HttpServletResponse resp):
   a. For commands "Validate" and "Install" to check roles MeludiRole.LIBRARY_PREP and MeludiRole.LIBRARY_PLATE_DESIGNER, and create them if missing.
   b. For command "GetPermissions" to include information on membership in roles MeludiRole.LIBRARY_PREP and MeludiRole.LIBRARY_PLATE_DESIGNER, respectively.

File:

• extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/InstallServlet.java (modified) (3 diffs)

extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/InstallServlet.java

@@ -48 +48 @@
 import net.sf.basedb.core.Project;
 import net.sf.basedb.core.ProjectKey;
+import net.sf.basedb.core.Role;
 import net.sf.basedb.core.SessionControl;
 import net.sf.basedb.core.SharedItem;
@@ -135 +136 @@
         jsonChecks.add(checkMeludiRole(dc, MeludiRole.ADMINISTRATOR, createIfMissing));
         jsonChecks.add(checkMeludiRole(dc, MeludiRole.SAMPLE_PREP, createIfMissing));
+        jsonChecks.add(checkMeludiRole(dc, MeludiRole.LIBRARY_PREP, createIfMissing));
+        jsonChecks.add(checkMeludiRole(dc, MeludiRole.LIBRARY_PLATE_DESIGNER, createIfMissing));
 
         int projectId = dc.getSessionControl().getActiveProjectId();
@@ -528 +531 @@
         jsonPermissions.put("PatientCurator", MeludiRole.PATIENT_CURATOR.isMember(dc) ? 1 : 0);
         jsonPermissions.put("SamplePrep", MeludiRole.SAMPLE_PREP.isMember(dc) ? 1 : 0);
+        jsonPermissions.put("LibraryPrep", MeludiRole.LIBRARY_PREP.isMember(dc) ? 1 : 0);
+        jsonPermissions.put("LibraryPlateDesigner", MeludiRole.LIBRARY_PLATE_DESIGNER.isMember(dc) ? 1 : 0);
         
         json.put("permissions", jsonPermissions);