Author: jmitchell
Date: Fri Apr 14 21:43:31 2006
New Revision: 394255
URL: http://svn.apache.org/viewcvs?rev=394255&view=rev
Log:
fix for SaveSubscription, CreateSubscription, and EditSubscription
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/MainMenu.jsp
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Registration.jsp
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/MainMenu.jsp
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/MainMenu.jsp?rev=394255&r1=394254&r2=394255&view=diff
==============================================================================
--- struts/action/trunk/apps/scripting-mailreader/src/main/webapp/MainMenu.jsp
(original)
+++ struts/action/trunk/apps/scripting-mailreader/src/main/webapp/MainMenu.jsp
Fri Apr 14 21:43:31 2006
@@ -11,7 +11,7 @@
<h3><bean:message key="mainMenu.heading"/> <bean:write name="user"
property="fullName"/></h3>
<ul>
- <li><html:link action="/EditRegistration"><bean:message
+ <li><html:link action="/EditRegistration?task=Edit"><bean:message
key="mainMenu.registration"/></html:link></li>
<li><html:link action="/Logoff"><bean:message key="mainMenu.logoff"/>
</html:link></li>
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Registration.jsp
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Registration.jsp?rev=394255&r1=394254&r2=394255&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Registration.jsp
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Registration.jsp
Fri Apr 14 21:43:31 2006
@@ -148,13 +148,13 @@
<bean:write name="subscription" property="autoConnect"/>
</td>
<td align="center">
- <html:link action="/DeleteSubscription"
+ <html:link action="/EditSubscription?task=Delete"
paramName="subscription" paramId="host"
paramProperty="host">
<bean:message key="registration.deleteSubscription"/>
</html:link>
- <html:link action="/EditSubscription"
+ <html:link action="/EditSubscription?task=Edit"
paramName="subscription" paramId="host"
paramProperty="host">
<bean:message key="registration.editSubscription"/>
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv?rev=394255&r1=394254&r2=394255&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv
Fri Apr 14 21:43:31 2006
@@ -2,9 +2,12 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.apps.mailreader.*;
+import org.apache.struts.apps.mailreader.dao.*;
import javax.servlet.ServletException;
-act = request.getParameter("action");
+System.out.println(" EditSubscription.gv (debug) begin");
+
+act = request.getParameter("task");
if (act == null) {
act = "Create";
}
@@ -12,7 +15,7 @@
host = request.getParameter("host");
if (log.isDebugEnabled()) {
log.debug("EditSubscriptionAction: Processing " + act +
- " action");
+ " task");
}
// Is there a currently logged on user?
@@ -22,18 +25,21 @@
log.trace(" User is not logged on in session "
+ session.getId());
}
- struts.setForwardName("logon");
+ struts.setForwardName("Logon");
+ System.out.println(" EditSubscription.gv (debug) -> Logon");
return;
}
// Identify the relevant subscription
subscription =
user.findSubscription(request.getParameter("host"));
+
if ((subscription == null) && !act.equals("Create")) {
if (log.isTraceEnabled()) {
log.trace(" No subscription for user " +
user.getUsername() + " and host " + host);
}
- struts.setForwardName("failure");
+ System.out.println(" EditSubscription.gv (debug) -> Failure");
+ struts.setForwardName("Failure");
return;
}
@@ -41,15 +47,18 @@
session.setAttribute(Constants.SUBSCRIPTION_KEY, subscription);
}
+
form = struts.form;
-form.setAction(act);
-if (!act.equals("Create")) {
+System.out.println(" EditSubscription.gv (debug) Form:" + form.toString());
+
+form.set("task", act);
+if (act.equals("Edit")) {
+ System.out.println(" EditSubscription.gv (debug) act=" + act);
if (log.isTraceEnabled()) {
log.trace(" Populating form from " + subscription);
}
try {
PropertyUtils.copyProperties(form, subscription);
- form.setAction(act);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
if (t == null)
@@ -64,8 +73,9 @@
// Forward control to the edit subscription page
if (log.isTraceEnabled()) {
- log.trace(" Forwarding to 'success' page");
+ log.trace(" Forwarding to 'Success' page");
}
-struts.setForwardName("success");
+System.out.println(" EditSubscription.gv (debug) Form:" + form.toString());
+struts.setForwardName("Success");
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv?rev=394255&r1=394254&r2=394255&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv
Fri Apr 14 21:43:31 2006
@@ -6,7 +6,7 @@
form = struts.form;
-act = form.get("action")();
+act = form.get("task");
if (act == null) {
act = "?";
}
@@ -35,7 +35,7 @@
"' was cancelled");
}
session.removeAttribute(Constants.SUBSCRIPTION_KEY);
- struts.setForwardName("success");
+ struts.setForwardName("Success");
return;
}
@@ -72,7 +72,7 @@
} catch (Exception e) {
log.error("Database save", e);
}
- struts.setForwardName("success");
+ struts.setForwardName("Success");
return;
}
@@ -116,4 +116,4 @@
log.trace(" Forwarding to success page");
}
-struts.setForwardName("success");
+struts.setForwardName("Success");
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml?rev=394255&r1=394254&r2=394255&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml
Fri Apr 14 21:43:31 2006
@@ -205,11 +205,12 @@
<action
path="/SaveSubscription"
extends="/Save*"
+ parameter="/WEB-INF/scripts/SaveSubscription.gv"
type="org.apache.struts.scripting.ScriptAction"
name="SubscriptionForm">
<forward
name="Success"
- path="/EditRegistration.do"/>
+ path="/EditRegistration.do?task=Edit"/>
<forward
name="Input"
path="/Subscription.do"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
