You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/07/26 16:30:05 UTC
svn commit: r559829 - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
web/WEB-INF/classes/ApplicationResources.properties
web/WEB-INF/classes/struts.xml web/WEB-INF/jsps/admin/ModifyUser.jsp
Author: snoopdave
Date: Thu Jul 26 07:30:05 2007
New Revision: 559829
URL: http://svn.apache.org/viewvc?view=rev&rev=559829
Log:
Fixing ROL-1477, error handling was incomplete. Also fixed title o modify user page.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?view=diff&rev=559829&r1=559828&r2=559829
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java Thu Jul 26 07:30:05 2007
@@ -89,12 +89,12 @@
*/
public String execute() {
- if(getUser().getId() != null) {
+ if (getUser() != null && getUser().getId() != null) {
// populate form data from user profile data
getBean().copyFrom(getUser(), getLocale());
} else {
- // TODO: i18n
- addError("No user specified");
+ addError("userAdmin.error.userNotFound");
+ return ERROR;
}
return INPUT;
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=559829&r1=559828&r2=559829
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties Thu Jul 26 07:30:05 2007
@@ -1505,8 +1505,8 @@
or password. Select user and click edit button to edit the user''s profile \
and the user''s weblogs.
-userAdmin.title.editUser=Editing user [{0}]
-userAdmin.subtitle.editUser=Change users profile and admin permissions
+userAdmin.title.editUser=Edit user profile
+userAdmin.subtitle.editUser=Editing profile and permissions for user <span>{0}</span>
userAdmin.prompt.editUser=You can change a user''s profile, give them \
global admin privileges or disable them. \
NOTE: You can also reset a users password here, but if they use Roller''s \
@@ -1564,6 +1564,8 @@
userAdmin.tip.userAdmin=Check to give this user Global Admin permission.
userAdmin.tip.locale=User''s preferred locale.
userAdmin.tip.timeZone=User''s preferred timezone.
+
+userAdmin.error.userNotFound=Specified user not found
# --------------------------------------------------------------- User register
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml?view=diff&rev=559829&r1=559828&r2=559829
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml Thu Jul 26 07:30:05 2007
@@ -148,6 +148,8 @@
<action name="userAdmin"
class="org.apache.roller.weblogger.ui.struts2.admin.UserAdmin">
<result name="success" type="tiles">.UserAdmin</result>
+ <result name="error" type="tiles">.UserAdmin</result>
+ <result name="input" type="tiles">.UserAdmin</result>
</action>
<action name="createUser!*" method="{1}"
@@ -158,6 +160,7 @@
<action name="modifyUser!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.admin.ModifyUser">
<result name="input" type="tiles">.ModifyUser</result>
+ <result name="error" type="chain">userAdmin</result>
</action>
<action name="globalCommentManagement!*" method="{1}"
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp?view=diff&rev=559829&r1=559828&r2=559829
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp Thu Jul 26 07:30:05 2007
@@ -15,9 +15,13 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
--%>
-<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<p class="subtitle"><s:text name="userAdmin.subtitle.editUser" /></p>
+<p class="subtitle">
+ <s:text name="userAdmin.subtitle.editUser">
+ <s:param value="bean.userName" />
+ </s:text>
+</p>
<s:form action="modifyUser!save">
<s:hidden name="bean.id" />