Author: mfranklin
Date: Wed Jun 20 17:24:19 2012
New Revision: 1352217
URL: http://svn.apache.org/viewvc?rev=1352217&view=rev
Log:
Fixed User serialization RAVE-667
Modified:
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
Modified:
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java?rev=1352217&r1=1352216&r2=1352217&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java
Wed Jun 20 17:24:19 2012
@@ -21,6 +21,7 @@ package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
import org.apache.rave.portal.model.conversion.JpaConverter;
import org.apache.rave.portal.model.impl.PersonImpl;
+import org.apache.rave.util.CollectionUtils;
import org.springframework.security.core.GrantedAuthority;
import javax.persistence.*;
@@ -149,9 +150,7 @@ public class JpaUser extends JpaPerson i
@Override
public Collection<GrantedAuthority> getAuthorities() {
- Collection<GrantedAuthority> grantedAuthorities = new
ArrayList<GrantedAuthority>();
- grantedAuthorities.addAll(authorities);
- return grantedAuthorities;
+ return
CollectionUtils.<GrantedAuthority>toBaseTypedCollection(authorities);
}
@Override
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java?rev=1352217&r1=1352216&r2=1352217&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
Wed Jun 20 17:24:19 2012
@@ -19,9 +19,7 @@
package org.apache.rave.portal.web.controller.admin;
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.PortalPreference;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
@@ -128,13 +126,6 @@ public class UserController {
return ViewNames.ADMIN_USERDETAIL;
}
- /* TODO - Fix binding of Authorities
- * When the model was converted to interfaces, the authorities no longer
bind correctly to the object that is
- * stuffed into the session by spring form. This means the JpaUser that
was added to the model in the method above
- * cannot get updated properly when the form is parsed by the sping data
binder. No errors are noted though, so the
- * process proceeds. If we use the UserForm class here, we need to pull
the user out of the database and update its values
- *
- */
@RequestMapping(value = "/admin/userdetail/update", method =
RequestMethod.POST)
public String updateUserDetail(@ModelAttribute User user, BindingResult
result,
@ModelAttribute(ModelKeys.TOKENCHECK)
String sessionToken,
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java?rev=1352217&r1=1352216&r2=1352217&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
Wed Jun 20 17:24:19 2012
@@ -123,7 +123,7 @@ public class UserControllerTest {
ModelMap modelMap = new ExtendedModelMap();
final Long userid = 123L;
final String email = "[email protected]";
- User user = new UserImpl(userid, "john.doe.sr");
+ UserImpl user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
user.setConfirmPassword("secrect");
user.setEmail(email);
@@ -148,7 +148,7 @@ public class UserControllerTest {
public void updateUserDetail_withErrors() {
ModelMap modelMap = new ExtendedModelMap();
Long userid = 123L;
- User user = new UserImpl(userid, "john.doe.sr");
+ UserImpl user = new UserImpl(userid, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user,
"user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -163,7 +163,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void updateUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- User user = new UserImpl(123L, "john.doe.sr");
+ UserImpl user = new UserImpl(123L, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user,
"user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
Modified:
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp?rev=1352217&r1=1352216&r2=1352217&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
(original)
+++
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
Wed Jun 20 17:24:19 2012
@@ -70,6 +70,7 @@
<fieldset>
<legend><fmt:message
key="admin.userdetail.editdata"/></legend>
<input type="hidden" name="token" value="<c:out
value="${tokencheck}"/>"/>
+ <form:hidden path="username" />
<div class="control-group">
<label class="control-label"
for="email"><fmt:message key="page.general.email"/></label>
<div class="controls"><spring:bind
path="email">
