Author: simoneg
Date: Fri Feb 12 17:38:16 2010
New Revision: 909514
URL: http://svn.apache.org/viewvc?rev=909514&view=rev
Log:
Fix for forms auto submit after refactoring
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj?rev=909514&r1=909513&r2=909514&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj
Fri Feb 12 17:38:16 2010
@@ -23,7 +23,7 @@
import org.apache.magma.website.Head;
import org.apache.magma.basics.LocalizableString;
import org.apache.magma.basics.MagmaException;
-import org.apache.magma.view.tree.FieldNode;
+import org.apache.magma.view.tree.Node;
import java.io.Writer;
import org.apache.magma.website.HtmlProducer;
@@ -43,28 +43,25 @@
return producer;
}
- after(BeanFormProducer prod, FieldNode node, Writer out) :
- execution(* BeanFormProducer.createField(FieldNode, Writer))
- && args(node, out) && this(prod) {
- if (prod.autoSubmit == null) return;
- if (prod.autoSubmit.contains(node.getId())) {
- try {
- out.append(" <input
class=\"MagmaRefreshButton\" type=\"submit\" name=\"magmaWorkingButton\"
id=\"working-");
- out.append(node.getId());
- out.append("\" value=\"");
- out.append(new
LocalizableString("Refresh").toString());
- out.append("\"/>");
- } catch (IOException e) {
- throw new MagmaException(e, "Error adding
refresh button");
- }
+ String around(BeanFormProducer prod, Node node) :
+ execution(String BeanFormProducer.valueFor(Node))
+ && args(node) && this(prod) {
+ String orig = proceed(prod, node);
+ if (prod.autoSubmit != null &&
prod.autoSubmit.contains(node.getId())) {
+ orig += " <input class=\"MagmaRefreshButton\"
type=\"submit\" name=\"magmaWorkingButton\" id=\"working-";
+ orig += node.getId();
+ orig += "\" value=\"";
+ orig += new LocalizableString("Refresh").toString();
+ orig += "\"/>";
}
+ return orig;
}
after(BeanFormProducer p, Head head) :
execution(public void BeanFormProducer.head(Head)) &&
args(head) && this (p) {
if (p.autoSubmit == null) return;
- head.addExternalScript("formsSupport.js");
+
head.addExternalScript("magma:/common/beansview/formsSupport.js");
StringWriter writer = new StringWriter();
writer.append("\nfunction initForm() {\n");
for (String nodeid : p.autoSubmit) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
