You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by co...@apache.org on 2012/08/14 16:09:14 UTC

svn commit: r1372890 - in /incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console: pages/panels/ResultSetPanel.java rest/UserRestClient.java

Author: coheigea
Date: Tue Aug 14 14:09:14 2012
New Revision: 1372890

URL: http://svn.apache.org/viewvc?rev=1372890&view=rev
Log:
[SYNCOPE-187] - When deleting an user, REST error doesn't bring error message to display

Modified:
    incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java
    incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java

Modified: incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java?rev=1372890&r1=1372889&r2=1372890&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java (original)
+++ incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java Tue Aug 14 14:09:14 2012
@@ -467,7 +467,8 @@ public class ResultSetPanel extends Pane
                             editmodal.show(target);
 
                         } catch (SyncopeClientCompositeErrorException scce) {
-                            error(scce.getMessage());
+                            error(getString("operation_error") + ": " + scce.getMessage());
+                            target.add(feedbackPanel);
                         }
                     }
                 }, ActionLink.ActionType.DELETE, "Users", "delete");

Modified: incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java?rev=1372890&r1=1372889&r2=1372890&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java (original)
+++ incubator/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java Tue Aug 14 14:09:14 2012
@@ -146,13 +146,13 @@ public class UserRestClient extends Abst
                 // perform on resource if and only if resources have been speciofied
                 append("performRemotely=").append(!statuses.isEmpty()).append("&");
 
-        boolean performLoacal = false;
+        boolean performLocal = false;
 
         for (StatusBean status : statuses) {
             if ((enable && !status.getStatus().isActive()) || (!enable && status.getStatus().isActive())) {
 
                 if ("Syncope".equals(status.getResourceName())) {
-                    performLoacal = true;
+                    performLocal = true;
                 } else {
                     query.append("resourceNames=").append(status.getResourceName()).append("&");
                 }
@@ -160,7 +160,7 @@ public class UserRestClient extends Abst
         }
 
         // perform on syncope if and only if it has been requested
-        query.append("performLocally=").append(performLoacal);
+        query.append("performLocally=").append(performLocal);
 
         return SyncopeSession.get().getRestTemplate().getForObject(query.toString(), UserTO.class);
     }