You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/08/26 16:32:52 UTC
svn commit: r1517546 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/business/
java/org/apache/roller/weblogger/pojos/
java/org/apache/roller/weblogger/ui/struts2/admin/
resources/org/apache/roller/weblogger/pojos/ webapp/WEB-INF/jsps...
Author: gmazza
Date: Mon Aug 26 14:32:51 2013
New Revision: 1517546
URL: http://svn.apache.org/r1517546
Log:
ROL-1954 restore list of blogs editable by a user on the user management screen.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java?rev=1517546&r1=1517545&r2=1517546&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java Mon Aug 26 14:32:51 2013
@@ -248,7 +248,7 @@ public interface UserManager {
/**
* Confirm user's permission within specified weblog or throw exception if no pending permission exists.
- * (changes state of permsission record to pending = true)
+ * (changes state of permission record to pending = true)
* @param weblog Weblog to grant permissions in
* @param user User to grant permissions to
* @param actions Actions to be granted
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java?rev=1517546&r1=1517545&r2=1517546&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java Mon Aug 26 14:32:51 2013
@@ -57,9 +57,7 @@ public class User implements Serializabl
private String activationCode;
private Set roles = new HashSet();
- private List permissions = new ArrayList();
-
-
+
public User() {
}
@@ -134,7 +132,7 @@ public class User implements Serializabl
String encrypt = WebloggerConfig.getProperty("passwds.encryption.enabled");
String algorithm = WebloggerConfig.getProperty("passwds.encryption.algorithm");
- if (new Boolean(encrypt).booleanValue()) {
+ if (new Boolean(encrypt)) {
setPassword(Utilities.encodePassword(newPassword, algorithm));
} else {
setPassword(newPassword);
@@ -300,5 +298,5 @@ public class User implements Serializabl
public int hashCode() {
return new HashCodeBuilder().append(getUserName()).toHashCode();
}
-
+
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java?rev=1517546&r1=1517545&r2=1517546&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java Mon Aug 26 14:32:51 2013
@@ -99,7 +99,7 @@ public class WeblogPermission extends Ob
return true;
} else if (hasAction(POST)) {
- // Best we've got is POST, so make sure perm doesn't specify POST
+ // Best we've got is POST, so make sure perm doesn't specify ADMIN
for (String action : rperm.getActionsAsList()) {
if (action.equals(ADMIN)) return false;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?rev=1517546&r1=1517545&r2=1517546&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java Mon Aug 26 14:32:51 2013
@@ -18,6 +18,7 @@
package org.apache.roller.weblogger.ui.struts2.admin;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang.StringUtils;
@@ -29,6 +30,7 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.GlobalPermission;
import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.core.RollerContext;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -225,5 +227,14 @@ public class ModifyUser extends UIAction
public boolean isUserEditingSelf() {
return getUser().equals(getAuthenticatedUser());
}
-
+
+ public List<WeblogPermission> getPermissions() {
+ try {
+ return WebloggerFactory.getWeblogger().getUserManager().getWeblogPermissions(user);
+ } catch (WebloggerException ex) {
+ log.error("ERROR getting permissions for user " + user.getUserName(), ex);
+ }
+ return new ArrayList<WeblogPermission>();
+ }
+
}
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml?rev=1517546&r1=1517545&r2=1517546&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml Mon Aug 26 14:32:51 2013
@@ -24,9 +24,6 @@
<named-query name="User.getByEnabled&EndDate&StartDateOrderByStartDateDesc">
<query>SELECT u FROM User u WHERE u.enabled = ?1 AND u.dateCreated < ?2 AND u.dateCreated > ?3 ORDER BY u.dateCreated DESC</query>
</named-query>
- <!-- <named-query name="User.getByEnabled&Permissions.website">
- <query>SELECT u FROM User u JOIN u.permissions p WHERE u.enabled = ?1 AND p.weblog = ?2</query>
- </named-query> -->
<named-query name="User.getByEnabled&UserNameOrEmailAddressStartsWith">
<query>SELECT u FROM User u WHERE u.enabled = ?1 AND (u.userName LIKE ?2 OR u.emailAddress LIKE ?3)</query>
</named-query>
@@ -45,15 +42,6 @@
<named-query name="User.getByUserNameOrderByUserName">
<query>SELECT u FROM User u WHERE u.userName= ?1 ORDER BY u.userName</query>
</named-query>
- <!-- <named-query name="User.getByPermissions.website">
- <query>SELECT u FROM User u JOIN u.permissions p WHERE p.weblog = ?1</query>
- </named-query>
- <named-query name="User.getByPermissions.website&Enabled&EndDate&StartDate">
- <query>SELECT u FROM User u JOIN u.permissions p WHERE p.weblog = ?1 AND u.enabled = ?2 AND u.dateCreated < ?3 AND u.dateCreated > ?4</query>
- </named-query>
- <named-query name="User.getByPermissions.website&EndDate&StartDate">
- <query>SELECT u FROM User u JOIN u.permissions p WHERE p.weblog = ?1 AND u.dateCreated < ?2 AND u.dateCreated > ?3</query>
- </named-query> -->
<named-query name="User.getByEndDate&StartDateOrderByStartDateDesc">
<query>SELECT u FROM User u WHERE u.dateCreated < ?1 AND u.dateCreated > ?2 ORDER BY u.dateCreated DESC</query>
</named-query>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp?rev=1517546&r1=1517545&r2=1517546&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp Mon Aug 26 14:32:51 2013
@@ -96,20 +96,20 @@
<p class="subtitle"><s:text name="userAdmin.userWeblogs" /></p>
- <s:if test="user.permissions != null && !user.permissions.isEmpty() > 0">
+ <s:if test="permissions != null && !permissions.isEmpty() > 0">
<p><s:text name="userAdmin.userMemberOf" /></p>
<table class="rollertable" style="width: 80%">
- <s:iterator id="perms" value="user.permissions">
+ <s:iterator id="perms" value="permissions">
<tr>
<td width="%30">
- <a href='<s:property value="baseURL" />/<s:property value="#perms.website.handle" />'>
- <s:property value="#perms.website.name" /> [<s:property value="#perms.website.handle" />]
+ <a href='<s:property value="#perms.weblog.absoluteURL" />'>
+ <s:property value="#perms.weblog.name" /> [<s:property value="#perms.weblog.handle" />]
</a>
</td>
<td width="%15">
<s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry">
- <s:param name="weblog" value="#perms.website.handle" />
+ <s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/page_white_edit.png"/>' />
<a href='<s:property value="newEntry" />'>
@@ -117,7 +117,7 @@
</td>
<td width="%15">
<s:url action="entries" namespace="/roller-ui/authoring" id="editEntries">
- <s:param name="weblog" value="#perms.website.handle" />
+ <s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/page_white_edit.png"/>' />
<a href='<s:property value="editEntries" />'>
@@ -125,7 +125,7 @@
</td>
<td width="%15">
<s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
- <s:param name="weblog" value="#perms.website.handle" />
+ <s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/page_white_edit.png"/>' />
<a href='<s:property value="manageWeblog" />'>