Author: ghuber
Date: Tue Mar 25 14:41:11 2014
New Revision: 1581353
URL: http://svn.apache.org/r1581353
Log:
Tidy interceptors in struts.xml.
Don't chain on "cancel" requests, otherwise parameter issues.
Testing changes!!
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
Tue Mar 25 14:41:11 2014
@@ -22,6 +22,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.List;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -135,6 +136,15 @@ public class BookmarkAdd extends UIActio
return INPUT;
}
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
+
public void myValidate() {
// name is required, max length, no html
if (getFolder().hasBookmarkOfName(getBean().getName())) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
Tue Mar 25 14:41:11 2014
@@ -22,6 +22,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.List;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -42,6 +43,9 @@ public class BookmarkEdit extends UIActi
private static Log log = LogFactory.getLog(BookmarkEdit.class);
+ // the id of the folder we are working with
+ private String folderId = null;
+
// the bookmark we are editing
private WeblogBookmark bookmark = null;
@@ -122,6 +126,14 @@ public class BookmarkEdit extends UIActi
return INPUT;
}
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
public void myValidate() {
if (StringUtils.isNotEmpty(getBean().getUrl()) &&
!validURL(getBean().getUrl())) {
@@ -144,6 +156,13 @@ public class BookmarkEdit extends UIActi
return valid;
}
+ public String getFolderId() {
+ return folderId;
+ }
+
+ public void setFolderId(String folderId) {
+ this.folderId = folderId;
+ }
public WeblogBookmark getBookmark() {
return bookmark;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
Tue Mar 25 14:41:11 2014
@@ -20,6 +20,7 @@ package org.apache.roller.weblogger.ui.s
import java.util.Collections;
import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -100,6 +101,15 @@ public class CategoryAdd extends UIActio
return INPUT;
}
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
+
public void myValidate() {
// TODO: Check max length & no html
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
Tue Mar 25 14:41:11 2014
@@ -131,6 +131,14 @@ public class CategoryEdit extends UIActi
return INPUT;
}
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
// TODO: validation
public void myValidate() {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
Tue Mar 25 14:41:11 2014
@@ -21,6 +21,7 @@ package org.apache.roller.weblogger.ui.s
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -134,6 +135,14 @@ public class CategoryRemove extends UIAc
return execute();
}
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
public String getRemoveId() {
return removeId;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
Tue Mar 25 14:41:11 2014
@@ -117,6 +117,15 @@ public class EntryRemove extends EntryBa
return INPUT;
}
+
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
public String getRemoveId() {
return removeId;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
Tue Mar 25 14:41:11 2014
@@ -20,6 +20,7 @@ package org.apache.roller.weblogger.ui.s
import java.util.Collections;
import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.BookmarkManager;
@@ -38,6 +39,9 @@ public class FolderAdd extends UIAction
private static Log log = LogFactory.getLog(FolderAdd.class);
+ // the id of the folder we are working with
+ private String folderId = null;
+
// bean for managing form data
private FolderBean bean = new FolderBean();
@@ -96,6 +100,14 @@ public class FolderAdd extends UIAction
return INPUT;
}
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
// TODO: validation
public void myValidate() {
@@ -117,4 +129,11 @@ public class FolderAdd extends UIAction
this.bean = bean;
}
+ public String getFolderId() {
+ return folderId;
+ }
+
+ public void setFolderId(String folderId) {
+ this.folderId = folderId;
+ }
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
Tue Mar 25 14:41:11 2014
@@ -20,6 +20,7 @@ package org.apache.roller.weblogger.ui.s
import java.util.Collections;
import java.util.List;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,6 +42,9 @@ public class FolderEdit extends UIAction
private static Log log = LogFactory.getLog(FolderEdit.class);
+ // the id of the folder we are working with
+ private String folderId = null;
+
// the folder we are editing
private WeblogBookmarkFolder folder = null;
@@ -131,6 +135,14 @@ public class FolderEdit extends UIAction
return INPUT;
}
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
// TODO: validation
public void myValidate() {
@@ -163,4 +175,11 @@ public class FolderEdit extends UIAction
this.bean = bean;
}
+ public String getFolderId() {
+ return folderId;
+ }
+
+ public void setFolderId(String folderId) {
+ this.folderId = folderId;
+ }
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
Tue Mar 25 14:41:11 2014
@@ -20,6 +20,7 @@ package org.apache.roller.weblogger.ui.s
import java.util.Collections;
import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
@@ -162,6 +163,14 @@ public class MembersInvite extends UIAct
return INPUT;
}
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
public String getUserName() {
return userName;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
Tue Mar 25 14:41:11 2014
@@ -140,6 +140,15 @@ public class TemplateRemove extends UIAc
return "confirm";
}
+
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return "cancel";
+ }
public String getRemoveId() {
return removeId;
Modified: roller/trunk/app/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Tue Mar 25 14:41:11 2014
@@ -27,20 +27,22 @@
default stack -->
<interceptor-stack name="rollerStack">
<interceptor-ref name="exception"/>
- <interceptor-ref name="alias"/>
+ <!-- <interceptor-ref name="alias"/> -->
<interceptor-ref name="servletConfig"/>
- <interceptor-ref name="prepare"/>
+ <!-- <interceptor-ref name="prepare"/> -->
<interceptor-ref name="i18n"/>
<interceptor-ref name="chain"/>
- <interceptor-ref name="debugging"/>
- <interceptor-ref name="profiling"/>
- <interceptor-ref name="scopedModelDriven"/>
- <interceptor-ref name="modelDriven"/>
+ <!-- <interceptor-ref name="debugging"/> -->
+ <!-- <interceptor-ref name="profiling"/> -->
+ <!-- <interceptor-ref name="scopedModelDriven"/> -->
+ <!-- <interceptor-ref name="modelDriven"/> -->
<interceptor-ref name="fileUpload"/>
<interceptor-ref name="checkbox"/>
+ <interceptor-ref name="multiselect"/>
<interceptor-ref name="staticParams"/>
+ <interceptor-ref name="actionMappingParams"/>
<interceptor-ref name="params">
- <param name="excludeParams">dojo\..*</param>
+ <param
name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
@@ -290,6 +292,10 @@
class="org.apache.roller.weblogger.ui.struts2.editor.EntryRemove">
<result name="input" type="tiles">.EntryRemove</result>
<result name="error" type="chain">menu</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">entries</param>
+ <param name="weblog">${weblog}</param>
+ </result>
<result name="success" type="chain">entryAdd</result>
</action>
@@ -332,17 +338,29 @@
class="org.apache.roller.weblogger.ui.struts2.editor.CategoryAdd">
<result name="input" type="tiles">.CategoryAdd</result>
<result name="success" type="chain">categories</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">categories</param>
+ <param name="weblog">${weblog}</param>
+ </result>
<result name="error" type="chain">categories</result>
</action>
<action name="categoryEdit!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.editor.CategoryEdit">
<result name="input" type="tiles">.CategoryEdit</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">categories</param>
+ <param name="weblog">${weblog}</param>
+ </result>
</action>
<action name="categoryRemove!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.editor.CategoryRemove">
<result name="input" type="tiles">.CategoryRemove</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">categories</param>
+ <param name="weblog">${weblog}</param>
+ </result>
<result name="success" type="chain">categories</result>
</action>
@@ -355,12 +373,24 @@
class="org.apache.roller.weblogger.ui.struts2.editor.BookmarkAdd">
<result name="input" type="tiles">.BookmarkAdd</result>
<result name="success" type="chain">bookmarks</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">bookmarks</param>
+ <param name="weblog">${weblog}</param>
+ <param name="folderId">${folderId}</param>
+ <param name="suppressEmptyParameters">true</param>
+ </result>
<result name="error" type="chain">bookmarks</result>
</action>
<action name="bookmarkEdit!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.editor.BookmarkEdit">
<result name="input" type="tiles">.BookmarkEdit</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">bookmarks</param>
+ <param name="weblog">${weblog}</param>
+ <param name="folderId">${folderId}</param>
+ <param name="suppressEmptyParameters">true</param>
+ </result>
<result name="error" type="chain">bookmarks</result>
</action>
@@ -374,12 +404,24 @@
class="org.apache.roller.weblogger.ui.struts2.editor.FolderAdd">
<result name="input" type="tiles">.FolderAdd</result>
<result name="success" type="chain">bookmarks</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">bookmarks</param>
+ <param name="weblog">${weblog}</param>
+ <param name="folderId">${folderId}</param>
+ <param name="suppressEmptyParameters">true</param>
+ </result>
<result name="error" type="chain">bookmarks</result>
</action>
<action name="folderEdit!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.editor.FolderEdit">
<result name="input" type="tiles">.FolderEdit</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">bookmarks</param>
+ <param name="weblog">${weblog}</param>
+ <param name="folderId">${folderId}</param>
+ <param name="suppressEmptyParameters">true</param>
+ </result>
<result name="error" type="chain">bookmarks</result>
</action>
@@ -440,6 +482,10 @@
<action name="templateRemove!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.editor.TemplateRemove">
<result name="confirm" type="tiles">.TemplateRemove</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">templates</param>
+ <param name="weblog">${weblog}</param>
+ </result>
<result name="success" type="chain">templates</result>
</action>
@@ -450,9 +496,7 @@
<result name="success" type="chain">templates</result>
<result name="cancel" type="redirectAction">
<param name="actionName">templates</param>
- <param name="parse">true</param>
<param name="weblog">${weblog}</param>
- <param name="suppressEmptyParameters">true</param>
</result>
<result name="error" type="chain">templates</result>
</action>
@@ -467,6 +511,10 @@
<result name="input" type="tiles">.MembersInvite</result>
<result name="disabled" type="tiles">.disabled</result>
<result name="success" type="chain">members</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">members</param>
+ <param name="weblog">${weblog}</param>
+ </result>
</action>
<action name="memberResign!*" method="{1}"
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp Tue
Mar 25 14:41:11 2014
@@ -26,6 +26,7 @@
<s:form action="bookmarkAdd!save">
<s:hidden name="salt" />
<s:hidden name="weblog" />
+ <s:hidden name="folder.name" />
<s:hidden name="folderId" />
<table>
@@ -41,17 +42,17 @@
</tr>
<tr>
- <td><s:text name="bookmarkForm.url" /></td>
+ <td><s:text name="bookmarkForm.url" /></td>
<td><s:textfield name="bean.url" maxlength="255" size="70" /></td>
</tr>
<tr>
- <td><s:text name="bookmarkForm.rssUrl" /></td>
+ <td><s:text name="bookmarkForm.rssUrl" /></td>
<td><s:textfield name="bean.feedUrl" maxlength="255" size="70"
/></td>
</tr>
<tr>
- <td><s:text name="bookmarkForm.image" /></td>
+ <td><s:text name="bookmarkForm.image" /></td>
<td><s:textfield name="bean.image" maxlength="255" size="70"
/></td>
</tr>
@@ -59,7 +60,7 @@
<p>
<s:submit value="%{getText('bookmarkForm.save')}" />
- <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarks"
/>
+ <s:submit value="%{getText('bookmarkForm.cancel')}"
action="bookmarkAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp Tue
Mar 25 14:41:11 2014
@@ -27,9 +27,7 @@
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
-
- <%-- if we cancel then we need this attribute --%>
- <s:hidden name="folderId" value="%{bookmark.folder.id}" />
+ <s:hidden name="folderId" />
<table>
@@ -44,17 +42,17 @@
</tr>
<tr>
- <td><s:text name="bookmarkForm.url" /></td>
+ <td><s:text name="bookmarkForm.url" /></td>
<td><s:textfield name="bean.url" maxlength="255" size="70" /></td>
</tr>
<tr>
- <td><s:text name="bookmarkForm.rssUrl" /></td>
+ <td><s:text name="bookmarkForm.rssUrl" /></td>
<td><s:textfield name="bean.feedUrl" maxlength="255" size="70"
/></td>
</tr>
<tr>
- <td><s:text name="bookmarkForm.image" /></td>
+ <td><s:text name="bookmarkForm.image" /></td>
<td><s:textfield name="bean.image" maxlength="255" size="70"
/></td>
</tr>
@@ -62,7 +60,7 @@
<p>
<s:submit value="%{getText('bookmarkForm.save')}" />
- <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarks"
/>
+ <s:submit value="%{getText('bookmarkForm.cancel')}"
action="bookmarkAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Tue Mar
25 14:41:11 2014
@@ -64,6 +64,7 @@ function onMove()
<s:url id="editUrl" action="folderEdit">
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="bean.id" value="%{folder.id}" />
+ <s:param name="folderId" value="%{folder.id}"
suppressEmptyParameters="true" />
</s:url>
<s:a href="%{editUrl}"><img src='<s:url
value="/images/page_white_edit.png"/>' border="0" alt="icon" /
title="<s:text name='bookmarksForm.folder.edit.tip' />" /></s:a>
@@ -131,6 +132,7 @@ function onMove()
<s:url id="editUrl" action="bookmarkEdit">
<s:param name="weblog" value="%{actionWeblog.handle}"
/>
<s:param name="bean.id" value="#bookmark.id" />
+ <s:param name="folderId" value="%{folderId}"
suppressEmptyParameters="true" />
</s:url>
<s:a href="%{editUrl}"><img src='<s:url
value="/images/page_white_edit.png"/>' border="0" alt="icon"
title="<s:text name='bookmarksForm.edit.tip' />"
/></s:a>
@@ -139,8 +141,7 @@ function onMove()
<td class="rollertable" align="center">
<s:if test="#bookmark.url != null" >
<a href="<s:property value="#bookmark.url" />">
- <img src='<s:url value="/images/world_go.png"/>'
border="0" alt="icon"
- title="<s:text
name='bookmarksForm.visitLink.tip' />" />
+ <img src='<s:url value="/images/world_go.png"/>'
border="0" alt="icon" title="<s:text name='bookmarksForm.visitLink.tip' />" />
</a>
</s:if>
</td>
@@ -159,19 +160,19 @@ function onMove()
<div class="control">
<s:if test="folder.bookmarks.size > 0">
<%-- Delete-selected button --%>
- <input type="button" value="<s:text
name="bookmarksForm.delete"/>" onclick="onDelete()" />
+ <input type="button" value="<s:text
name="bookmarksForm.delete"/>" onclick="onDelete();return false;" />
</s:if>
<s:if test="!allFolders.isEmpty && folder.bookmarks.size > 0">
<%-- Move-selected button --%>
- <s:submit type="button" action="bookmarks!move"
key="bookmarksForm.move" onclick="onMove();return false;" />
+ <s:submit value="%{getText('bookmarksForm.move')}"
action="bookmarks!move" onclick="onMove();return false;" />
<%-- Move-to combo-box --%>
<s:select name="targetFolderId" list="allFolders" listKey="id"
listValue="name" />
</s:if>
<s:if test="folder.name != 'default'">
- <s:submit type="button" action="bookmarks!deleteFolder"
key="bookmarksForm.deleteFolder" onclick="onDeleteFolder();return false;"/>
+ <s:submit value="%{getText('bookmarksForm.deleteFolder')}"
action="bookmarks!deleteFolder" onclick="onDeleteFolder();return false;"/>
</s:if>
</div>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp Tue
Mar 25 14:41:11 2014
@@ -28,7 +28,6 @@
<s:form action="categoryAdd!save">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:hidden name="categoryId" />
<table>
@@ -51,7 +50,7 @@
<p>
<s:submit value="%{getText('categoryForm.save')}" />
- <s:submit value="%{getText('categoryForm.cancel')}"
action="categories" />
+ <s:submit value="%{getText('categoryForm.cancel')}"
action="categoryAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Tue
Mar 25 14:41:11 2014
@@ -29,9 +29,6 @@
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
-
- <%-- if we cancel then we need this attribute --%>
- <s:hidden name="categoryId" value="%{category.website.defaultCategory.id}"
/>
<table>
@@ -54,7 +51,7 @@
<p>
<s:submit value="%{getText('categoryForm.save')}" />
- <s:submit value="%{getText('categoryForm.cancel')}"
action="categories" />
+ <s:submit value="%{getText('categoryForm.cancel')}"
action="categoryEdit!cancel" />
</p>
</s:form>
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp Tue
Mar 25 14:41:11 2014
@@ -26,9 +26,6 @@
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="removeId" />
-
- <%-- if we cancel then we need this attribute --%>
- <s:hidden name="categoryId" value="%{category.website.defaultCategory.id}"
/>
<s:if test="category.inUse" >
<br />
@@ -49,6 +46,6 @@
</p>
<s:submit value="%{getText('application.yes')}" />
- <s:submit value="%{getText('application.no')}" action="categories" />
+ <s:submit value="%{getText('application.no')}"
action="categoryRemove!cancel" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp Tue
Mar 25 14:41:11 2014
@@ -41,8 +41,7 @@
<s:form action="entryEdit">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:hidden name="bean.id" value="%{removeId}" />
- <s:submit value="%{getText('weblogEntryRemove.no')}" />
+ <s:submit value="%{getText('weblogEntryRemove.no')}"
action="entryRemove!cancel" />
</s:form>
</td>
</tr>
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
Tue Mar 25 14:41:11 2014
@@ -33,7 +33,7 @@
<tr>
<td>
<s:form action="entryRemoveViaList!remove">
- <s:hidden name="salt" />
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="removeId" />
<s:submit value="%{getText('weblogEntryRemove.yes')}" />
@@ -43,8 +43,7 @@
<s:form action="entries">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:hidden name="bean.id" value="%{removeId}" />
- <s:submit value="%{getText('weblogEntryRemove.no')}" />
+ <s:submit value="%{getText('weblogEntryRemove.no')}"
action="entryRemove!cancel" />
</s:form>
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp Tue Mar
25 14:41:11 2014
@@ -26,7 +26,6 @@
<s:form action="folderAdd!save">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:hidden name="folderId" />
<table>
<tr>
@@ -37,7 +36,7 @@
<p>
<s:submit value="%{getText('folderForm.save')}" />
- <s:submit value="%{getText('folderForm.cancel')}" action="bookmarks" />
+ <s:submit value="%{getText('folderForm.cancel')}"
action="folderAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp Tue Mar
25 14:41:11 2014
@@ -41,7 +41,7 @@
<p>
<s:submit value="%{getText('folderForm.save')}" />
- <s:submit value="%{getText('folderForm.cancel')}" action="bookmarks" />
+ <s:submit value="%{getText('folderForm.cancel')}"
action="folderEdit!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp Tue
Mar 25 14:41:11 2014
@@ -59,7 +59,7 @@
<br />
<s:submit value="%{getText('inviteMember.button.save')}" />
- <s:submit value="%{getText('application.cancel')}" action="members" />
+ <s:submit value="%{getText('application.cancel')}" action="invite!cancel"
/>
</s:form>
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp Tue
Mar 25 14:41:11 2014
@@ -42,13 +42,13 @@
<tr>
<td>
<s:form action="templateRemove!remove">
- <s:hidden name="salt" />
+ <s:hidden name="salt" />
<s:hidden name="removeId" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<s:submit value="%{getText('application.yes')}" />
- <s:submit value="%{getText('application.no')}"
action="templates" />
+ <s:submit value="%{getText('application.no')}"
action="templateRemove!cancel" />
</s:form>
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp?rev=1581353&r1=1581352&r2=1581353&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp Tue
Mar 25 14:41:11 2014
@@ -26,7 +26,6 @@
<s:form action="weblogConfig!save">
<s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
- <s:hidden name="bean.defaultCategoryId" />
<table class="formtableNoDesc">
@@ -248,7 +247,7 @@
</tr>
</s:if>
<s:else>
- <s:hidden name="pageModels" />
+ <s:hidden name="bean.pageModels" />
</s:else>
</table>
