Changeset 29052

Timestamp:

01/15/08 14:05:19 (11 months ago)

Author:

ddupraz

Message:

NXP-1900 forwarded to the trunk (no conflict between classical listBox and ChainSelect?)

Files:

• org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/directory/ChainSelect.java (modified) (2 diffs)
• org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/directory/ChainSelectStatus.java (modified) (1 diff)

org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/directory/ChainSelect.java

@@ -379 +379 @@
-                continue;
-            }
-selections[0].getColumnValue(i - 1) != null
+(selections.length != 0 && selections[0].getColumnValue(i - 1) != null)
-                rebuildOptions(i);
-            }
@@ -631 +631 @@
-                log.warn(String.format("No selection for dir %s ",
-                        directoryName));
+                return new Selection(
+                        itemList.toArray(new DirectorySelectItem[0]));
-            }
-        }

org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/directory/ChainSelectStatus.java

@@ -239 +239 @@
-            String concatenatedLabel = StringUtils.join(displayedLabels,
-                    separator);
+            if (concatenatedLabel.compareTo("") == 0 && displayedLabels.length != 0){
+                concatenatedLabel = translate(context,"label.directories.error");
+            }
-            writer.write(concatenatedLabel);
-            writer.endElement("div");