svn commit: r1439860 - in /syncope/trunk/console/src/main/java/org/apache/syncope/console: commons/StatusUtils.java rest/UserRestClient.java

[ilgrosso]

Author: ilgrosso
Date: Tue Jan 29 12:37:25 2013
New Revision: 1439860

URL: http://svn.apache.org/viewvc?rev=1439860&view=rev
Log:
[SYNCOPE-122] Fixing attempting re-enablement of enabled user

Modified:
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java?rev=1439860&r1=1439859&r2=1439860&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
 Tue Jan 29 12:37:25 2013
@@ -217,13 +217,24 @@ public class StatusUtils implements Seri
     }
 
     public static PropagationRequestTO buildPropagationRequestTO(final 
Collection<StatusBean> statuses) {
+        return buildPropagationRequestTO(statuses, null);
+    }
+
+    public static PropagationRequestTO buildPropagationRequestTO(final 
Collection<StatusBean> statuses,
+            final Boolean enable) {
+
         PropagationRequestTO propagationRequestTO = new PropagationRequestTO();
 
         for (StatusBean status : statuses) {
-            if ("Syncope".equals(status.getResourceName())) {
-                propagationRequestTO.setOnSyncope(true);
-            } else {
-                propagationRequestTO.addResource(status.getResourceName());
+            if (enable == null
+                    || (enable && !status.getStatus().isActive()) || (!enable 
&& status.getStatus().isActive())) {
+
+                if ("Syncope".equals(status.getResourceName())) {
+                    propagationRequestTO.setOnSyncope(true);
+                } else {
+                    propagationRequestTO.addResource(status.getResourceName());
+                }
+
             }
         }
 

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java?rev=1439860&r1=1439859&r2=1439860&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
 Tue Jan 29 12:37:25 2013
@@ -111,10 +111,10 @@ public class UserRestClient extends Abst
     }
 
     public UserTO suspend(final long userId, final List<StatusBean> statuses) {
-        return getService(UserService.class).suspend(userId, 
StatusUtils.buildPropagationRequestTO(statuses));
+        return getService(UserService.class).suspend(userId, 
StatusUtils.buildPropagationRequestTO(statuses, false));
     }
 
     public UserTO reactivate(final long userId, final List<StatusBean> 
statuses) {
-        return getService(UserService.class).reactivate(userId, 
StatusUtils.buildPropagationRequestTO(statuses));
+        return getService(UserService.class).reactivate(userId, 
StatusUtils.buildPropagationRequestTO(statuses, true));
     }
 }