Changeset 3928


Ignore:
Timestamp:
May 12, 2016, 1:07:29 PM (5 years ago)
Author:
olle
Message:

Refs #525. INCA importer updated in preparation for release of first version:

  1. JSP file index.jsp in resources/ updated by removing entries "experimental not-implemented" from class description for "inca-import" <span> tag.
  2. Java servlet class/file IncaServlet.java in src/net/sf/basedb/reggie/servlet/ updated in protected method void doPost(HttpServletRequest req, HttpServletResponse resp) for command "ImportInca" by moving code for creating a DbControl item and checking role permissions to the top, in order to make increase similarity with other servlets.
Location:
extensions/net.sf.basedb.reggie/trunk
Files:
2 edited

Legend:

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

    r3847 r3928  
    345345
    346346            <li><span id="inca-import"
    347               class="require-permission experimental not-implemented"
     347              class="require-permission"
    348348              data-role="PatientCurator"
    349349              data-link="personal/import-inca.jsp?ID=<%=ID%>"
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/IncaServlet.java

    r3927 r3928  
    192192      if ("ImportInca".equals(cmd))
    193193      {
     194        dc = sc.newDbControl();
     195
     196        ReggieRole.checkPermission(dc, "'" + cmd + "' wizard", ReggieRole.PATIENT_CURATOR, ReggieRole.ADMINISTRATOR);
     197
    194198        SimpleProgressReporter progress = new SimpleProgressReporter(null);
    195199        sc.setSessionSetting("inca-import-progress", progress);
     
    199203        float progressBiosourceMappingFraction = 0.30f;
    200204        float progressTestFraction = 0.70f;
    201         dc = sc.newDbControl();
    202 
    203         ReggieRole.checkPermission(dc, "'" + cmd + "' wizard", ReggieRole.PATIENT_CURATOR, ReggieRole.ADMINISTRATOR);
    204 
    205205        Date incaImportStart = new Date();
    206206
Note: See TracChangeset for help on using the changeset viewer.