Changeset 5604 for branches

Timestamp:

Apr 11, 2011, 2:07:57 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1602: The <base:select> taglib should display complete path for directories

File:

• branches/2.17-stable/src/clients/web/net/sf/basedb/clients/web/taglib/Select.java (modified) (4 diffs)

branches/2.17-stable/src/clients/web/net/sf/basedb/clients/web/taglib/Select.java

@@ -30 +30 @@
 import net.sf.basedb.clients.web.util.HTML;
 import net.sf.basedb.core.BasicItem;
+import net.sf.basedb.core.Directory;
 import net.sf.basedb.core.Nameable;
 import net.sf.basedb.core.Removable;
@@ -307 +308 @@
   */
   private String unselectedText = "- none -";
+  
+  private boolean tryGetDirectoryPath;
+  
   /*
     Taglib initialization methods
@@ -452 +456 @@
 //    Page page = (Page)findAncestorWithClass(this, Page.class);
 
+    tryGetDirectoryPath = true;
     
     StringBuilder sb = new StringBuilder();
@@ -558 +563 @@
     if (item instanceof Nameable)
     {
-      name = ((Nameable)item).getName();
+      if (tryGetDirectoryPath && item instanceof Directory)
+      {
+        try
+        {
+          name = ((Directory)item).getPath().toString();
+        }
+        catch (Exception ex)
+        {
+          tryGetDirectoryPath = false;
+        }
+      }
+      if (name == null) name = ((Nameable)item).getName();
     }
     else