Changeset 5043

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:

• install.js (modified) (2 diffs)
• install.jsp (modified) (4 diffs)

extensions/net.sf.basedb.relax/trunk/resources/admin/install.js

@@ -155 +155 @@
       Wizard.setWizardStatus('messagecontainer error', numErrors+' errors was detected. You need to fix those manually.');  
     }
-    else if (numMissing > 0)
+    else if (numWarnings > 0)
+    {
+      Wizard.setWizardStatus('messagecontainer note', numWarnings+' warnings was detected. Relax may still work. If not, you need to fix it manually.');
+    }
+    else
+    {
+      Wizard.setWizardStatus('all-checks-passed', 'All checks passed');
+    }
+    if (numMissing > 0)
     {
       Doc.show('createMissingItems');
@@ -162 +170 @@
     {
       Doc.show('fixIncompleteItems');
-    }
-    else if (numWarnings > 0)
-    {
-      Wizard.setWizardStatus('messagecontainer note', numWarnings+' warnings was detected. Relax may still work. If not, you need to fix it manually.');
-    }
-    else
-    {
-      Wizard.setWizardStatus('all-checks-passed', 'All checks passed');
     }
   }

extensions/net.sf.basedb.relax/trunk/resources/admin/install.jsp

@@ -84 +84 @@
 {
   top: auto; 
-  height: 5em; 
+  height: 8em; 
   left: 1em; 
   right: 1em;
@@ -119 +119 @@
   <div class="content" id="wizard">
 
-    <div class="absolutefull bottomborder" style="bottom: 5em;">
+    <div class="absolutefull bottomborder" style="bottom: 8em;">
     <table id="itemTable" class="topborder bottomborder" style="display: none;">
     <thead class="bg-filled-100 bottomborder">
@@ -152 +152 @@
 
     <div class="absolutefull working" id="workInProgress">
+      <div id="wizard-status" style="display:none; margin-top: 1em;"></div>
+      
       <div id="createMissingItems" style="display:none; margin-top: 1em;">
         <base:buttongroup>
@@ -163 +165 @@
         </base:buttongroup>
       </div>
-      <div id="wizard-status" style="display:none; margin-top: 1em;"></div>
     </div>