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 2006/11/20 17:33:58 UTC
svn commit: r477243 - in
/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts:
actions/UserAdminAction.java formbeans/UserAdminForm.java
Author: snoopdave
Date: Mon Nov 20 08:33:57 2006
New Revision: 477243
URL: http://svn.apache.org/viewvc?view=rev&rev=477243
Log:
Fix for ROL-1296, cannot disable user
Modified:
incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java
incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java
Modified: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java?view=diff&rev=477243&r1=477242&r2=477243
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java Mon Nov 20 08:33:57 2006
@@ -232,7 +232,7 @@
} catch (RollerException e) {
msgs.add(ActionErrors.GLOBAL_ERROR,
- new ActionMessage(e.getMessage()));
+ new ActionError("error.untranslated", e.getRootCauseMessage()));
saveErrors(request, msgs);
}
} else {
Modified: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java?view=diff&rev=477243&r1=477242&r2=477243
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java Mon Nov 20 08:33:57 2006
@@ -109,6 +109,9 @@
throws RollerException
{
super.copyTo(user, locale);
+
+ if (user.getEnabled() == null) user.setEnabled(Boolean.FALSE);
+
if (mUserAdmin.booleanValue())
{
user.grantRole("admin");