syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject syncope git commit: [SYNCOPE-823] Fixed
Date Thu, 07 Apr 2016 08:57:13 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 0016d10c9 -> f126c4841


[SYNCOPE-823] Fixed


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

Branch: refs/heads/master
Commit: f126c48419a2dba75bdd5ef413cc2326dedff442
Parents: 0016d10
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Apr 7 10:56:59 2016 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Apr 7 10:56:59 2016 +0200

----------------------------------------------------------------------
 .../syncope/client/console/panels/WorkflowTogglePanel.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/f126c484/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
index cc6d577..88aaeb1 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
@@ -55,8 +55,8 @@ public class WorkflowTogglePanel extends TogglePanel<String> {
         container.setOutputMarkupPlaceholderTag(true);
         addInnerObject(container);
 
-        BookmarkablePageLink<Void> activitiModeler = new BookmarkablePageLink<>("activitiModeler",
-                ActivitiModelerPopupPage.class);
+        BookmarkablePageLink<Void> activitiModeler =
+                new BookmarkablePageLink<>("activitiModeler", ActivitiModelerPopupPage.class);
         activitiModeler.setPopupSettings(new VeilPopupSettings().setHeight(600).setWidth(800));
         MetaDataRoleAuthorizationStrategy.authorize(activitiModeler, ENABLE, StandardEntitlement.WORKFLOW_DEF_READ);
         container.add(activitiModeler);
@@ -78,6 +78,8 @@ public class WorkflowTogglePanel extends TogglePanel<String> {
 
             @Override
             public void onClose(final AjaxRequestTarget target) {
+                modal.show(false);
+                modal.close(target);
                 target.add(workflowDefDiagram);
             }
         });
@@ -91,7 +93,6 @@ public class WorkflowTogglePanel extends TogglePanel<String> {
                 target.add(modal.setContent(new XMLWorkflowEditorModalPanel(modal, new WorkflowRestClient(),
pageRef)));
 
                 modal.header(new ResourceModel("xmlEditorTitle"));
-
                 modal.show(true);
             }
         };


Mime
View raw message