Changeset 3077

Timestamp:

Jan 22, 2007, 2:15:31 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #431: Multiple tables from the Table taglib on the same HTML page interfere with each other

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/taglib/table/Table.java (modified) (1 diff)
• www/common/columns/configure.jsp (modified) (4 diffs)
• www/include/scripts/table.js (modified) (1 diff)
• www/plugins/net/sf/basedb/clients/web/plugins/simple_export.jsp (modified) (3 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/Table.java

@@ -403 +403 @@
     if (cd.getFormatter() != null) columnFormatter.put(columnId, cd.getFormatter());
     
-    script.append("Table.addColumn(new Column('").append(cd.getId()).append("'");
+    script.append("Table.addColumn('").append(getId()).append("', new Column('").append(cd.getId()).append("'");
     script.append(",'").append(HTML.javaScriptEncode(cd.getTitle())).append("'");
     script.append(cd.getProperty() == null ? ",null" : ",'"+HTML.javaScriptEncode(cd.getProperty())+"'");

trunk/www/common/columns/configure.jsp

@@ -59 +59 @@
   <base:head>
     <script language="JavaScript">
+    var tableId = '<%=tableId%>';
 
     // Initialise the visible and hidden column lists
@@ -74 +75 @@
 
       // All column definitions
-      var columnDefs = window.opener.Table.columns;
+      var columnDefs = window.opener.Table.getColumnDefs(tableId);
 
       // Put all column in the hidden or visible list
@@ -131 +132 @@
     {
       var moved = 0;
-      var columnDefs = window.opener.Table.columns;
+      var columnDefs = window.opener.Table.getColumnDefs(tableId);
       for(i=0; i < list1.options.length; i++) // >
       {
@@ -178 +179 @@
       if (columns == '_minimal_')
       {
-        var columnDefs = window.opener.Table.columns;
+        var columnDefs = window.opener.Table.getColumnDefs(tableId);
         var temp = new Array();
         for (var i = 0; i < columnDefs.length; i++) // >

trunk/www/include/scripts/table.js

@@ -30 +30 @@
 function TableClass()
 {
-  this.columns = new Array();
+  this.tables = new Array();
 
   /**
     Add a column to the table
+    @param tableId The ID of the table to add the column to
     @param column The Column object to add
   */
-  this.addColumn = function(column)
-  {
-    this.columns[this.columns.length] = column;
-    this.columns['id'+column.id] = column;
+  this.addColumn = function(tableId, column)
+  {
+    var columns = this.tables[tableId];
+    if (!columns)
+    {
+      columns = new Array();
+      this.tables[tableId] = columns;
+    }
+    columns[columns.length] = column;
+    columns['id'+column.id] = column;
     if (column.property)
     {
-      this.columns['prop'+column.property] = column;
-    }
+      columns['prop'+column.property] = column;
+    }
+  }
+  
+  /**
+    Get all columns defined for the specified table.
+    @param tableId The ID of the table to get the columns for
+  */
+  this.getColumnDefs = function(tableId)
+  {
+    var columns = this.tables[tableId];
+    return this.tables[tableId];
   }
 

trunk/www/plugins/net/sf/basedb/clients/web/plugins/simple_export.jsp

@@ -81 +81 @@
       notExported.length = 0;
 
-      var columnDefs = window.opener.Table.columns;
+      var columnDefs = window.opener.Table.getColumnDefs(tableId);
       // Move all columns into the not exported or exported list
       var list = columns == 'all' ? exported : notExported;
@@ -163 +163 @@
     {
       var list = document.forms['export'].exported;
-      var columnDefs = window.opener.Table.columns;
+      var columnDefs = window.opener.Table.getColumnDefs(tableId);
       var selected = new Array();
       for (i = 0; i < list.options.length; i++) // >
@@ -175 +175 @@
     {
       var list = document.forms['export'].exported;
-      var columnDefs = window.opener.Table.columns;
+      var columnDefs = window.opener.Table.getColumnDefs(tableId);
       var selected = new Array();
       for (i = 0; i < list.options.length; i++) // >