Changeset 5043


Ignore:
Timestamp:
Oct 19, 2018, 1:35:32 PM (4 years ago)
Author:
Nicklas Nordborg
Message:

References #1071: Installation wizard doesn't show error message

The "Fix items" button is now displayed when there are items that can be fixed even if there is an error or not.

Location:
extensions/net.sf.basedb.relax/trunk/resources/admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.relax/trunk/resources/admin/install.js

    r5042 r5043  
    155155      Wizard.setWizardStatus('messagecontainer error', numErrors+' errors was detected. You need to fix those manually.'); 
    156156    }
    157     else if (numMissing > 0)
     157    else if (numWarnings > 0)
     158    {
     159      Wizard.setWizardStatus('messagecontainer note', numWarnings+' warnings was detected. Relax may still work. If not, you need to fix it manually.');
     160    }
     161    else
     162    {
     163      Wizard.setWizardStatus('all-checks-passed', 'All checks passed');
     164    }
     165    if (numMissing > 0)
    158166    {
    159167      Doc.show('createMissingItems');
     
    162170    {
    163171      Doc.show('fixIncompleteItems');
    164     }
    165     else if (numWarnings > 0)
    166     {
    167       Wizard.setWizardStatus('messagecontainer note', numWarnings+' warnings was detected. Relax may still work. If not, you need to fix it manually.');
    168     }
    169     else
    170     {
    171       Wizard.setWizardStatus('all-checks-passed', 'All checks passed');
    172172    }
    173173  }
  • extensions/net.sf.basedb.relax/trunk/resources/admin/install.jsp

    r5041 r5043  
    8484{
    8585  top: auto;
    86   height: 5em;
     86  height: 8em;
    8787  left: 1em;
    8888  right: 1em;
     
    119119  <div class="content" id="wizard">
    120120
    121     <div class="absolutefull bottomborder" style="bottom: 5em;">
     121    <div class="absolutefull bottomborder" style="bottom: 8em;">
    122122    <table id="itemTable" class="topborder bottomborder" style="display: none;">
    123123    <thead class="bg-filled-100 bottomborder">
     
    152152
    153153    <div class="absolutefull working" id="workInProgress">
     154      <div id="wizard-status" style="display:none; margin-top: 1em;"></div>
     155     
    154156      <div id="createMissingItems" style="display:none; margin-top: 1em;">
    155157        <base:buttongroup>
     
    163165        </base:buttongroup>
    164166      </div>
    165       <div id="wizard-status" style="display:none; margin-top: 1em;"></div>
    166167    </div>
    167168 
Note: See TracChangeset for help on using the changeset viewer.