Changeset 2240


Ignore:
Timestamp:
Feb 21, 2014, 8:54:10 AM (9 years ago)
Author:
Nicklas Nordborg
Message:

Marking some wizards with 'not-implemented' to prepare for 2.15 release.

Fixed issue with incorrect permission check on 'Register sequencing ended' wizard.

File:
1 edited

Legend:

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

    r2226 r2240  
    114114    {
    115115      var wizard = wizards[wizardNo];
    116       var role = wizard.getAttribute('data-role');
    117       if (myPermissions[role] == 1 || isAdmin)
     116      if (wizard.className.indexOf('not-implemented') == -1)
    118117      {
    119         wizard.className = 'link';
    120         wizard.addEventListener('click', goWizard);
    121       }
    122       else
    123       {
    124         wizard.title = 'You do not have permission to user this wizard';
     118        var role = wizard.getAttribute('data-role');
     119        if (myPermissions[role] == 1 || isAdmin)
     120        {
     121          wizard.className = 'link';
     122          wizard.addEventListener('click', goWizard);
     123        }
     124        else
     125        {
     126          wizard.title = 'You do not have permission to user this wizard';
     127        }
    125128      }
    126129    }
     
    477480  font-size: 1em;
    478481}
    479 a.not-implemented
     482.not-implemented
    480483{
    481484  filter: url(css/filters.svg#grayscale); /* Firfox, etc */
     
    485488}
    486489
    487 a.not-implemented:after
     490.not-implemented:after
    488491{
    489492  content: ' -- coming soon';
     
    679682            >Register sequencing started</span> <span class="counter" id="count.flow-cells.3" title="Counting..."><img src="images/loading-small.gif"></span>
    680683
    681           <li><span class="require-permission" data-role="LibPrep" data-link="libprep/sequencing_ended.jsp?ID=<%=ID%>"
     684          <li><span class="require-permission" data-role="LibraryPrep" data-link="libprep/sequencing_ended.jsp?ID=<%=ID%>"
    682685            >Register sequencing ended</span> <span class="counter" id="count.sequencing-run" title="Counting..."><img src="images/loading-small.gif"></span>
    683686          </ul>
     
    701704              >Confirm sequencing completed</span> <span class="counter" id="count.unconfirmed-sequencing-run" title="Counting..."><img src="images/loading-small.gif"></span>
    702705           
    703             <li><span class="require-permission" data-role="SecondaryAnalysis" data-link="analysis/demux_start.jsp?ID=<%=ID%>"
     706            <li><span class="require-permission not-implemented" data-role="SecondaryAnalysis" data-link="analysis/demux_start.jsp?ID=<%=ID%>"
    704707              >Start demux and merge</span>
    705             <li><span class="require-permission" data-role="SecondaryAnalysis" data-link="analysis/demux_end.jsp?ID=<%=ID%>"
     708            <li><span class="require-permission not-implemented" data-role="SecondaryAnalysis" data-link="analysis/demux_end.jsp?ID=<%=ID%>"
    706709              >Register demux and merge completed</span>
    707710            </ul>
     
    714717          <dd>
    715718            <ul>
    716             <li><span class="require-permission" data-role="SecondaryAnalysis" data-link="analysis/filter_start.jsp?ID=<%=ID%>"
     719            <li><span class="require-permission not-implemented" data-role="SecondaryAnalysis" data-link="analysis/filter_start.jsp?ID=<%=ID%>"
    717720              >Start filter and alignment</span>
    718             <li><span class="require-permission" data-role="SecondaryAnalysis" data-link="analysis/align_end.jsp?ID=<%=ID%>"
     721            <li><span class="require-permission not-implemented" data-role="SecondaryAnalysis" data-link="analysis/align_end.jsp?ID=<%=ID%>"
    719722              >Register filter and alignment completed</span>
    720723            </ul>
     
    727730          <dd>
    728731            <ul>
    729             <li><span class="require-permission" data-role="SecondaryAnalysis" data-link="analysis/feature_start.jsp?ID=<%=ID%>"
     732            <li><span class="require-permission not-implemented" data-role="SecondaryAnalysis" data-link="analysis/feature_start.jsp?ID=<%=ID%>"
    730733              >Start feature extraction</span>
    731             <li><span class="require-permission" data-role="SecondaryAnalysis" data-link="analysis/feature_end.jsp?ID=<%=ID%>"
     734            <li><span class="require-permission not-implemented" data-role="SecondaryAnalysis" data-link="analysis/feature_end.jsp?ID=<%=ID%>"
    732735              >Register feature extraction completed</span>
    733736            </ul>
Note: See TracChangeset for help on using the changeset viewer.