syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreapatrice...@apache.org
Subject syncope git commit: [SYNCOPE-1205] solved serialization error into ApprovalDirectoryPanel
Date Fri, 29 Sep 2017 12:43:21 GMT
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 0a0b41064 -> 2dbd7a29a


[SYNCOPE-1205] solved serialization error into ApprovalDirectoryPanel


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2dbd7a29
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2dbd7a29
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2dbd7a29

Branch: refs/heads/2_0_X
Commit: 2dbd7a29abfda2aaee41c9cc357454329f27d24a
Parents: 0a0b410
Author: Andrea Patricelli <andreapatricelli@apache.org>
Authored: Fri Sep 29 14:42:44 2017 +0200
Committer: Andrea Patricelli <andreapatricelli@apache.org>
Committed: Fri Sep 29 14:42:44 2017 +0200

----------------------------------------------------------------------
 .../client/console/approvals/ApprovalDirectoryPanel.java    | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/2dbd7a29/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
index 4b6272a..80e216d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
@@ -143,6 +143,7 @@ public class ApprovalDirectoryPanel
             @Override
             public void onClick(final AjaxRequestTarget target, final WorkflowFormTO ignore)
{
                 claimForm(model.getObject().getTaskId());
+                SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
                 ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
                 target.add(container);
             }
@@ -220,7 +221,6 @@ public class ApprovalDirectoryPanel
 
                 editItemActionEvent.forceModalPanel(
                         new ApprovalUserWizardBuilder(
-                                target,
                                 formModel.getObject(),
                                 previousUserTO,
                                 newUserTO,
@@ -301,7 +301,6 @@ public class ApprovalDirectoryPanel
     private void claimForm(final String taskId) {
         try {
             restClient.claimForm(taskId);
-            SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
         } catch (SyncopeClientException scee) {
             SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + scee.getMessage());
         }
@@ -313,10 +312,7 @@ public class ApprovalDirectoryPanel
 
         private final WorkflowFormTO formTO;
 
-        private final AjaxRequestTarget target;
-
         ApprovalUserWizardBuilder(
-                final AjaxRequestTarget target,
                 final WorkflowFormTO formTO,
                 final UserTO previousUserTO,
                 final UserTO userTO,
@@ -326,7 +322,6 @@ public class ApprovalDirectoryPanel
 
             super(previousUserTO, userTO, anyTypeClasses, formLayoutInfo, pageRef);
             this.formTO = formTO;
-            this.target = target;
         }
 
         @Override
@@ -340,7 +335,6 @@ public class ApprovalDirectoryPanel
                 UserTO user = new UserWorkflowRestClient().executeTask("default", inner);
                 actual.setEntity(user);
                 claimForm(restClient.getFormForUser(actual.getEntity().getKey()).getTaskId());
-                ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
             } else {
                 UserPatch patch = AnyOperations.diff(inner, formTO.getUserTO(), false);
 
@@ -358,7 +352,6 @@ public class ApprovalDirectoryPanel
                 } else {
                     actual = userRestClient.update(getOriginalItem().getInnerObject().getETagValue(),
patch);
                     claimForm(restClient.getFormForUser(actual.getEntity().getKey()).getTaskId());
-                    ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
                 }
 
             }


Mime
View raw message