Changeset 3536


Ignore:
Timestamp:
Oct 13, 2015, 12:11:30 PM (7 years ago)
Author:
olle
Message:

Refs #801. Refs #816. It has been decided not to use role MeludiRole.LIBRARY_PLATE_DESIGNER in MeLuDI. Where previously used, it is exchanged for role MeludiRole.LIBRARY_PREP:

  1. JSP file index.jsp in resources/ updated by exchanging "LibraryPlateDesigner" for "LibraryPrep".
  2. Data access object class/file MeludiRole.java in src/net/sf/basedb/meludi/dao/ updated by commenting out definition of role LIBRARY_PLATE_DESIGNER ("LibraryPlateDesigner").
  3. Java servlet class/file DnaServlet.java in src/net/sf/basedb/meludi/servlet/ updated by exchanging checks for role MeludiRole.LIBRARY_PLATE_DESIGNER for role MeludiRole.LIBRARY_PREP.
  4. Java servlet class/file InstallServlet.java in src/net/sf/basedb/meludi/servlet/ updated in protected method void doGet(HttpServletRequest req, HttpServletResponse resp) for commands "Validate" and "Install" to no longer create role MeludiRole.LIBRARY_PLATE_DESIGNER, if missing.
Location:
extensions/net.sf.basedb.meludi/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • extensions/net.sf.basedb.meludi/trunk/resources/index.jsp

    r3505 r3536  
    402402        <dd>
    403403          <ul>
    404           <li><span class="require-permission" data-role="LibraryPlateDesigner" data-link="libprep/select_rna.jsp?ID=<%=ID%>"
     404          <li><span class="require-permission" data-role="LibraryPrep" data-link="libprep/select_rna.jsp?ID=<%=ID%>"
    405405            >Create new mRNA plate</span>
    406406            <span class="counter" id="count.rna-without-mrna"
    … …  
    441441        <dd>
    442442          <ul>
    443           <li><span class="require-permission" data-role="LibraryPlateDesigner" data-link="libprep/select_dna_for_start_plate.jsp?ID=<%=ID%>"
     443          <li><span class="require-permission" data-role="LibraryPrep" data-link="libprep/select_dna_for_start_plate.jsp?ID=<%=ID%>"
    444444            >Create new start DNA plate</span>
    445445            <span class="counter" data-counter="start-lists-processed"
    … …  
    447447
    448448<!--         
    449           <li><span class="require-permission" data-role="LibraryPlateDesigner" data-link="libprep/select_dna.jsp?ID=<%=ID%>"
     449          <li><span class="require-permission" data-role="LibraryPrep" data-link="libprep/select_dna.jsp?ID=<%=ID%>"
    450450            >Create new DNA plate</span>
    451451            <span class="counter" id="count.rna-without-mrna"

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/dao/MeludiRole.java

    r3449 r3536  
    5757    The definition of the "LibraryPlateDesigner" role. Maps to a BASE role item.
    5858  */
    59   public static final MeludiRole<Role> LIBRARY_PLATE_DESIGNER = new MeludiRole<Role>("LibraryPlateDesigner", Item.ROLE);
     59  //public static final MeludiRole<Role> LIBRARY_PLATE_DESIGNER = new MeludiRole<Role>("LibraryPlateDesigner", Item.ROLE);
    6060
    6161  /**

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/DnaServlet.java

    r3450 r3536  
    741741        dc = sc.newDbControl();
    742742
    743         MeludiRole.checkPermission(dc, "'" + cmd + "' wizard", MeludiRole.LIBRARY_PLATE_DESIGNER, MeludiRole.ADMINISTRATOR);
     743        MeludiRole.checkPermission(dc, "'" + cmd + "' wizard", MeludiRole.LIBRARY_PREP, MeludiRole.ADMINISTRATOR);
    744744
    745745        JSONObject jsonReq = (JSONObject)new JSONParser().parse(req.getReader());

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

    r3527 r3536  
    137137        jsonChecks.add(checkMeludiRole(dc, MeludiRole.SAMPLE_PREP, createIfMissing));
    138138        jsonChecks.add(checkMeludiRole(dc, MeludiRole.LIBRARY_PREP, createIfMissing));
    139         jsonChecks.add(checkMeludiRole(dc, MeludiRole.LIBRARY_PLATE_DESIGNER, createIfMissing));
    140139
    141140        int projectId = dc.getSessionControl().getActiveProjectId();
    … …  
    532531        jsonPermissions.put("SamplePrep", MeludiRole.SAMPLE_PREP.isMember(dc) ? 1 : 0);
    533532        jsonPermissions.put("LibraryPrep", MeludiRole.LIBRARY_PREP.isMember(dc) ? 1 : 0);
    534         jsonPermissions.put("LibraryPlateDesigner", MeludiRole.LIBRARY_PLATE_DESIGNER.isMember(dc) ? 1 : 0);
    535533       
    536534        json.put("permissions", jsonPermissions);
Note: See TracChangeset for help on using the changeset viewer.