Author: mfranklin
Date: Wed Jun 20 02:09:09 2012
New Revision: 1351914
URL: http://svn.apache.org/viewvc?rev=1351914&view=rev
Log:
Fixed unable to delete users RAVE-652
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.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/db/initial_data.sql
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java?rev=1351914&r1=1351913&r2=1351914&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
Wed Jun 20 02:09:09 2012
@@ -25,6 +25,7 @@ import org.apache.rave.portal.repository
import org.apache.rave.portal.service.PortalPreferenceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
@@ -61,6 +62,7 @@ public class DefaultPortalPreferenceServ
}
@Override
+ @Transactional
public void savePreference(String key, String value) {
List<String> values = new ArrayList<String>();
values.add(value);
@@ -68,6 +70,7 @@ public class DefaultPortalPreferenceServ
}
@Override
+ @Transactional
public void savePreference(String key, List<String> values) {
PortalPreference preference = getPreference(key);
if (preference == null) {
@@ -79,6 +82,7 @@ public class DefaultPortalPreferenceServ
}
@Override
+ @Transactional
public void savePreference(PortalPreference preference) {
repository.save(preference);
}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1351914&r1=1351913&r2=1351914&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
Wed Jun 20 02:09:09 2012
@@ -203,6 +203,7 @@ public class DefaultUserService implemen
}
@Override
+ @Transactional
public void updateUserProfile(User user) {
userRepository.save(user);
}
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=1351914&r1=1351913&r2=1351914&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 02:09:09 2012
@@ -146,7 +146,7 @@ public class UserController {
}
@RequestMapping(value = "/admin/userdetail/delete", method =
RequestMethod.POST)
- public String deleteUserDetail(@ModelAttribute UserForm user,
+ public String deleteUserDetail(@ModelAttribute User user,
@ModelAttribute(ModelKeys.TOKENCHECK)
String sessionToken,
@RequestParam String token,
@RequestParam(required = false) String
confirmdelete,
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=1351914&r1=1351913&r2=1351914&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 02:09:09 2012
@@ -123,7 +123,7 @@ public class UserControllerTest {
ModelMap modelMap = new ExtendedModelMap();
final Long userid = 123L;
final String email = "[email protected]";
- UserImpl user = new UserImpl(userid, "john.doe.sr");
+ User 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;
- UserImpl user = new UserImpl(userid, "john.doe.sr");
+ User 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();
- UserImpl user = new UserImpl(123L, "john.doe.sr");
+ User user = new UserImpl(123L, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user,
"user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
@@ -184,7 +184,7 @@ public class UserControllerTest {
ModelMap modelMap = new ExtendedModelMap();
final Long userid = 123L;
final String email = "[email protected]";
- UserForm user = new UserForm(userid, "john.doe.sr");
+ User user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
user.setConfirmPassword(user.getConfirmPassword());
user.setEmail(email);
@@ -206,7 +206,7 @@ public class UserControllerTest {
public void deleteUserDetail_noConfirmChecked() {
ModelMap modelMap = new ExtendedModelMap();
Long userid = 123L;
- UserForm user = new UserForm(userid, "john.doe.sr");
+ User user = new UserImpl(userid, "john.doe.sr");
SessionStatus sessionStatus = createMock(SessionStatus.class);
replay(sessionStatus);
@@ -219,7 +219,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void deleteUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- UserForm user = new UserForm(123L, "john.doe.sr");
+ User user = new UserImpl(123L, "john.doe.sr");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
Modified:
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1351914&r1=1351913&r2=1351914&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
(original)
+++
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
Wed Jun 20 02:09:09 2012
@@ -190,17 +190,17 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- user association data --
set @next_person_association = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @person_association_seq);
INSERT INTO person_association(entity_id, follower_id, followed_id)
-VALUES (@next_person_association, @person_id_1, @person_id_2);
+VALUES (@next_person_association, @user_id_1, @user_id_2);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@person_association_seq;
set @next_person_association = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @person_association_seq);
INSERT INTO person_association(entity_id, follower_id, followed_id)
-VALUES (@next_person_association, @person_id_1, @person_id_3);
+VALUES (@next_person_association, @user_id_1, @user_id_3);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@person_association_seq;
set @next_person_association = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @person_association_seq);
INSERT INTO person_association(entity_id, follower_id, followed_id)
-VALUES (@next_person_association, @person_id_2, @person_id_4);
+VALUES (@next_person_association, @user_id_2, @user_id_4);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@person_association_seq;
-- end user association data --
