Changeset 4852 for branches/2.11-stable

Timestamp:

Mar 26, 2009, 1:16:36 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1277: Export button on Biowells list page leads to non-existing url

And made the export dialogue the same size as other export dialogs.

Location:

branches/2.11-stable/www/biomaterials/bioplates/wells

Files:

• index.jsp (modified) (6 diffs)
• list_biowells.jsp (modified) (1 diff)

branches/2.11-stable/www/biomaterials/bioplates/wells/index.jsp

@@ -149 +149 @@
     cc.configureQuery(query, true);
     cc.setQuery(query);
-    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+biowells";
+    redirect = root + "/common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+biowells";
   }
   else if ("ExportItem".equals(cmd))
@@ -155 +155 @@
     // Run an export plugin in single-item context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
-    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+biowell";
+    redirect = root + "/common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+biowell";
   }
   else if ("ImportItems".equals(cmd))
@@ -167 +167 @@
     cc.configureQuery(query, true);
     cc.setQuery(query);
-    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+biowells";
+    redirect = root + "/common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+biowells";
   }
   else if ("ImportItem".equals(cmd))
@@ -173 +173 @@
     // Run an import plugin in single-item context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
-    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+biowell";
+    redirect = root + "/common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+biowell";
   }
   else if ("RunListPlugin".equals(cmd))
@@ -185 +185 @@
     cc.configureQuery(query, true);
     cc.setQuery(query);
-    redirect = "../../common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&main_type=OTHER&title=Run+plugin";
+    redirect = root + "/common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&main_type=OTHER&title=Run+plugin";
   }
   else if ("RunPlugin".equals(cmd))
@@ -191 +191 @@
     // Run another plugin in single-item context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
-    redirect = "../../common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&main_type=OTHER&title=Run+plugin";
+    redirect = root + "/common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&main_type=OTHER&title=Run+plugin";
   }
   else

branches/2.11-stable/www/biomaterials/bioplates/wells/list_biowells.jsp

@@ -124 +124 @@
     function runPlugin(cmd)
     {
-      Table.submitToPopup(formId, cmd, 540, 460);
+      Table.submitToPopup(formId, cmd, 740, 540);
     }
     function returnSelected()