Changeset 2291

Timestamp:

Mar 14, 2014, 11:31:37 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #571: Update Reggie to new scripting pattern

I think the most critical parts have been fixed now. Reggie 2.16 should now work properly on a BASE 3.3 server with the default configuration.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• META-INF/extensions.xml (modified) (9 diffs)
• resources/scripts (added)
• resources/scripts/case-summary.js (added)
• resources/scripts/he-score.js (added)
• src/net/sf/basedb/reggie/extensions/CaseSummaryButtonFactory.java (modified) (3 diffs)
• src/net/sf/basedb/reggie/extensions/HistologyScoreButtonFactory.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/META-INF/extensions.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extensions xmlns="http://base.thep.lu.se/extensions.xsd">
-  <about>
+  <about safe-resources="0">
     <name>Reggie package</name>
     <description>
@@ -103 +103 @@
     >
     <index>10</index>
-    <about>
+    <about safe-scripts="1">
       <name>Reggie</name>
       <description>
@@ -116 +116 @@
         <title>Reggie</title>
         <tooltip>Access reggie operations</tooltip>
-        <onClick>Menu.openUrl('$HOME$/index.jsp?ID='+getSessionId())</onClick>
-        <icon>/images/padding.gif</icon>
+        <data-url>~/index.jsp?ID=$SESSION-ID$</data-url>
       </parameters>
     </action-factory>
@@ -129 +128 @@
       <ref index="1">net.sf.basedb.clients.web.toolbar.item.extract</ref>
     </extends>
-    <about>
+    <about safe-scripts="1">
       <name>Case summary</name>
       <description>
@@ -142 +141 @@
         net.sf.basedb.reggie.extensions.CaseSummaryButtonFactory
       </factory-class>
+      <parameters>
+        <title>Case summary</title>
+        <clazz>button auto-init</clazz>
+        <data-auto-init>reggie-case-summary-link</data-auto-init>
+        <data-home>$HOME$</data-home>
+        <icon>~/images/case_summary.png</icon>
+        <script>~/scripts/case-summary.js</script>
+      </parameters>
     </action-factory>
   </extension>
@@ -154 +161 @@
     </extends>
     <index>2</index>
-    <about>
+    <about safe-scripts="1">
       <name>Reggie column</name>
       <description>
@@ -174 +181 @@
     >
     <index>1</index>
-    <about>
+    <about safe-scripts="1">
       <name>Case overview</name>
       <description>
@@ -199 +206 @@
     extends="net.sf.basedb.clients.web.toolbar.item.bioplate"
     >
-    <about>
+    <about safe-scripts="1">
       <name>Histology score</name>
       <description>
@@ -210 +217 @@
         net.sf.basedb.reggie.extensions.HistologyScoreButtonFactory
       </factory-class>
+      <parameters>
+        <title>Score HE glass</title>
+        <clazz>button auto-init</clazz>
+        <data-auto-init>reggie-he-score-link</data-auto-init>
+        <data-home>$HOME$</data-home>
+        <icon>~/images/microscope.png</icon>
+        <script>~/scripts/he-score.js</script>
+      </parameters>
     </action-factory>
   </extension>

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/extensions/CaseSummaryButtonFactory.java

@@ -1 +1 @@
 package net.sf.basedb.reggie.extensions;
 
-import net.sf.basedb.clients.web.extensions.AbstractJspActionFactory;
 import net.sf.basedb.clients.web.extensions.JspContext;
 import net.sf.basedb.clients.web.extensions.toolbar.ButtonAction;
 import net.sf.basedb.clients.web.extensions.toolbar.ButtonBean;
+import net.sf.basedb.clients.web.extensions.toolbar.FixedButtonFactory;
 import net.sf.basedb.core.Nameable;
 import net.sf.basedb.reggie.Reggie;
@@ -19 +19 @@
 */
 public class CaseSummaryButtonFactory 
-  extends AbstractJspActionFactory<ButtonAction>
+  extends FixedButtonFactory
 {
 
@@ -52 +52 @@
 
     ButtonBean action = new ButtonBean();
-    action.setEnabled(true);
-    action.setIcon(reggieHome + "/images/case_summary.png");
-    action.setOnClick("location.href='" + reggieHome + "/reports/case_summary.jsp?ID="+ID+"&caseName=" + caseName + "'");
-    action.setTitle("Case summary");
+    action.setClazz(getClazz());
+    action.setEnabled(isEnabled());
+    action.setIcon(getIcon());
+    action.setId(getId());
+    action.setStyle(getStyle());
+    action.setTitle(getTitle());
+    action.setTooltip(getTooltip());
+    action.setVisible(isVisible());
+    action.setDynamicActionAttributesSource(this);
+    setParameter("data-case-name", caseName);
     action.setTooltip("Reggie: Show summary of case #" + caseName);
-    action.setVisible(true);
     actions = new ButtonAction[] { action };
     return actions;

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/extensions/HistologyScoreButtonFactory.java

@@ -3 +3 @@
 import java.util.regex.Pattern;
 
-import net.sf.basedb.clients.web.extensions.AbstractJspActionFactory;
 import net.sf.basedb.clients.web.extensions.JspContext;
 import net.sf.basedb.clients.web.extensions.toolbar.ButtonAction;
 import net.sf.basedb.clients.web.extensions.toolbar.ButtonBean;
+import net.sf.basedb.clients.web.extensions.toolbar.FixedButtonFactory;
 import net.sf.basedb.core.BioPlate;
 import net.sf.basedb.core.Nameable;
@@ -21 +21 @@
 */
 public class HistologyScoreButtonFactory 
-  extends AbstractJspActionFactory<ButtonAction>
+  extends FixedButtonFactory
 {
 
@@ -61 +61 @@
 
     ButtonBean action = new ButtonBean();
-    action.setEnabled(true);
-    action.setIcon(reggieHome + "/images/microscope.png");
-    action.setOnClick("location.href='" + reggieHome + "/sampleproc/histology_score.jsp?ID="+ID+"&name=" + heName + "'");
-    action.setTitle("Score HE glass");
-    action.setTooltip("Reggie: Goto HE glass scoring wizard");
-    action.setVisible(true);
+    action.setClazz(getClazz());
+    action.setEnabled(isEnabled());
+    action.setIcon(getIcon());
+    action.setId(getId());
+    action.setStyle(getStyle());
+    action.setTitle(getTitle());
+    action.setTooltip(getTooltip());
+    action.setVisible(isVisible());
+    action.setDynamicActionAttributesSource(this);
+    setParameter("data-he-plate-name", heName);
+    action.setTooltip("Reggie: Goto HE glass scoring wizard for plate " + heName);
     actions = new ButtonAction[] { action };
     return actions;