Changeset 2488

Timestamp:

Aug 7, 2006, 12:13:25 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixed sorting problem with always visible columns

File:

• trunk/www/common/columns/configure.jsp (modified) (2 diffs)

trunk/www/common/columns/configure.jsp

@@ -59 +59 @@
   <base:head>
     <script language="JavaScript">
-    
-    // Returns indexOf first occourence of value in the options list
-    function indexOf(options, value)
-    {
-      for(var index = 0; index < options.length; index++)
-      {
-        if(options[index].value == value)
-        {
-          return index;
-        }
-      }
-      return -1;
-    }
-    
-    function showColumns(columns)
-    {
-      var frm = document.forms['columns'];
-      var visible = frm.visible;
-      var hidden = frm.hidden;
-
-      // When adding the visible columns we put them directly in the correct place by adding the current length of the visible list
-      // which contains always visible items
-      var l = visible.length;
-      if(columns == 'all')
-      {
-        for(var i = 0;i < hidden.length; i++)
-        {         
-          visible[l+i] = new Option(hidden[i].innerHTML, hidden[i].value);          
-        }
-        hidden.length = 0;
-      }
-      else
-      {
-        var cols = columns.split(',');
-        // We go through the hidden list backwards to be able to remove items directly
-
-        for(i = 0; i < cols.length; i++)
-        {     
-          // Check if this column is among the visible
-          var index = indexOf(hidden, cols[i]);
-          if(index != -1 )
-          {
-            visible[visible.length] = new Option(hidden[index].innerHTML, hidden[index].value);
-            hidden[index] = null;           
-          }         
-        }                 
-      }
-    }
-    
-    // Initialise the visible and hidden column lists and show the additional columns
+
+    // Initialise the visible and hidden column lists
     function initColumns(columns)
     {
@@ -117 +69 @@
       hidden.length = 0;  
 
+      // The visibled columns (comma-separated)
+      var allVisible = columns == 'all';
+      var visibleCols = columns.split(',');
+
+      // All column definitions
       var columnDefs = window.opener.Table.columns;
-      // Put all columns in the hidden list
+
+      // Put all column in the hidden or visible list
+      var toList = allVisible ? visible : hidden;
       for (var i = 0; i < columnDefs.length; i++) 
       {
         var col = columnDefs[i];
-        if (!col.alwaysHide)
+        if (!col.alwaysHide) addCol(toList, col);
+      }
+      
+      // Move visible columns to the visible list
+      if (!allVisible)
+      {
+        for (var i = 0; i < visibleCols.length; i++)
         {
-          var option = new Option(col.title, col.id);
-          if (col.alwaysShow)
-          {
-            option.style.fontWeight = 'bold';
-            option.text = option.text+' ×';
-            visible[visible.length] = option;
-          }
-          else
-          {
-            hidden[hidden.length] = option;
+          var colId = visibleCols[i];
+          var col = columnDefs['id'+colId];
+          for (var j = 0; j < hidden.length; j++)
+          {
+            if (hidden[j].value == colId)
+            {
+              addCol(visible, col);
+              hidden[j] = null;
+              j = hidden.length;
+            }
           }
         }
-      }     
-      showColumns(columns);
-    }
-    
-
+        
+        // Move columns that must be visible to the visible list
+        for (var i = 0; i < hidden.length; i++)
+        {
+          var col = columnDefs['id'+hidden.options[i].value];
+          if (col && col.alwaysShow)
+          {
+            addCol(visible, col);
+            hidden[i] = null; 
+            i--;
+          }
+        }
+      }
+    }
+    
+    function addCol(toList, col)
+    {
+      var option = new Option(col.title, col.id);
+      if (col.alwaysShow)
+      {
+        option.style.fontWeight = 'bold';
+        option.text = option.text+' ×';
+      }
+      toList[toList.length] = option;
+    }
 
     // Moves all selected items in list1 to list2