Changeset 1666


Ignore:
Timestamp:
May 23, 2012, 9:01:39 AM (11 years ago)
Author:
Nicklas Nordborg
Message:

References #371, #372, #373. Fix things that was removed/disabled in [1612] and [1621] due to the delay of the Histology wizards.

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/index.jsp

    r1661 r1666  
    212212          <%
    213213        }
    214         // Deliberately disabled -- scheduled for Reggie 2.7
    215         if (hasCreateSamplePermission && hasCreateBioPlatePermission && false)
     214        if (hasCreateSamplePermission && hasCreateBioPlatePermission)
    216215        {
    217216          %>
     
    223222            <ul>
    224223            <li><a href="histology_move.jsp?ID=<%=ID%>">Move Histology items to paraffin blocks</a>
    225             <li><a href="histology_protocol.jsp?ID=<%=ID%>">Create/print lab tracking protocol for FFPE/HE</a>
     224            <li><a href="histology_protocol.jsp?ID=<%=ID%>">Lab tracking protocol for FFPE/HE</a>
    226225            <li><a href="histology_glass.jsp?ID=<%=ID%>">Register histology HE glass information</a>
    227226            </ul>
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/BioplateType.java

    r1621 r1666  
    4444  /**
    4545    The definition of the "Histology temporary storage box" plate type.
    46     @since 2.x
     46    @since 2.7
    4747  */
    4848  public static final BioplateType HISTOLOGY_STORAGE =
     
    5151  /**
    5252    The definition of the "Paraffin block" plate type.
    53     @since 2.x
     53    @since 2.7
    5454  */
    5555  public static final BioplateType PARAFFIN_BLOCK =
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1644 r1666  
    136136
    137137        // Plate geomtries
    138         // TODO #371 - temporarily disabled since this has been postponed
    139         //jsonChecks.add(checkPlateGeometry(dc, Geometry.THREE_BY_TWO, createIfMissing));
     138        jsonChecks.add(checkPlateGeometry(dc, Geometry.THREE_BY_TWO, createIfMissing));
    140139        jsonChecks.add(checkPlateGeometry(dc, Geometry.ONE_BY_TWELVE, createIfMissing));
    141140        jsonChecks.add(checkPlateGeometry(dc, Geometry.NINE_BY_NINE, createIfMissing));
     
    145144        jsonChecks.add(checkBioplateType(dc, BioplateType.BA_RNAQC, createIfMissing));
    146145        jsonChecks.add(checkBioplateType(dc, BioplateType.CALIPER_RNAQC, createIfMissing));
    147         /*
    148         TODO #371 - temporarily disabled since this has been postponed
    149146        jsonChecks.add(checkBioplateType(dc, BioplateType.HISTOLOGY_STORAGE, createIfMissing));
    150147        jsonChecks.add(checkBioplateType(dc, BioplateType.PARAFFIN_BLOCK, createIfMissing));
    151         */
    152148       
    153149        // MIME types
Note: See TracChangeset for help on using the changeset viewer.