Changeset 3916

Timestamp:

Oct 25, 2010, 9:57:13 AM (13 years ago)

Author:

olle

Message:

Refs #713. Class/file action/directory/ViewActiveDirectory.java in
client/servlet/ updated to no longer include columns from the
file table in the directory table, if the columns do not correspond
to an attribute for a directory item. An exception is the special
item Id column, which is used to select items:

1. Private method

List<Column> adaptTableHeader(int startIndex, Table templateTable, Table sourceTable)
updated to only add Id column, of template columns not in source
table.

2. Private method

Row adaptTableRow(Row row, int startIndex, Table templateTable, Table sourceTable)
updated to not add empty cell for template column not in source
table.

File:

• trunk/client/servlet/src/org/proteios/action/directory/ViewActiveDirectory.java (modified) (3 diffs)

trunk/client/servlet/src/org/proteios/action/directory/ViewActiveDirectory.java

@@ -1028 +1028 @@
             else
             {
-                // Add new column for template column not in source table
-                Column column = new Column(templateColumnName);
-                // If initial Id column, remove column name
-                if (i == 0 && column.getValue().equals("Id"))
-                {
-                    column.setValue("");
-                }
-                tmpTable.add(column);
-                log
-                .debug("i = " + i + " templateColumnName = \"" + templateColumnName + "\" new column \"" + column
-                .getValue() + "\" inserted.");
+              // Of template columns not in source table, only add "Id" column
+              if (templateColumnName.equals("Id"))
+              {               
+                    // Add new column for template column not in source table
+                    Column column = new Column(templateColumnName);
+                    // If initial Id column, remove column name
+                    if (i == 0 && column.getValue().equals("Id"))
+                    {
+                        column.setValue("");
+                    }
+                    tmpTable.add(column);
+                    log
+                    .debug("i = " + i + " templateColumnName = \"" + templateColumnName + "\" new column \"" + column
+                    .getValue() + "\" inserted.");
+              }
             }
         }
@@ -1127 +1131 @@
                 .getValue() + "\" inserted.");
             }
+            /*
             else
             {
@@ -1134 +1139 @@
                 .debug("New row i = " + i + " templateColumnName = \"" + templateColumnName + "\" empty cell inserted.");
             }
+            */
         }
         // Construct adapted source row.