You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/02/02 12:11:28 UTC

syncope git commit: [SYNCOPE-156] Hiding workflow toggle panel when Activiti not enabled

Repository: syncope
Updated Branches:
  refs/heads/master 22599aac5 -> bd757e36d


[SYNCOPE-156] Hiding workflow toggle panel when Activiti not enabled


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

Branch: refs/heads/master
Commit: bd757e36d28c01779c6d1c87ca86e85f8de3dab9
Parents: 22599aa
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 2 12:11:22 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 2 12:11:22 2016 +0100

----------------------------------------------------------------------
 .../syncope/client/console/pages/Workflow.java  | 21 +++++++++++---------
 .../console/panels/WorkflowTogglePanel.java     |  7 -------
 .../syncope/client/console/pages/Workflow.html  |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/bd757e36/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java
index 01135ea..fa8e6f7 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java
@@ -42,16 +42,10 @@ public class Workflow extends BasePage {
         noActivitiEnabledForUsers.setOutputMarkupPlaceholderTag(true);
         add(noActivitiEnabledForUsers);
 
-        final WebMarkupContainer workflowDef = new WebMarkupContainer("workflowDefContainer");
+        WebMarkupContainer workflowDef = new WebMarkupContainer("workflowDefContainer");
         workflowDef.setOutputMarkupPlaceholderTag(true);
 
-        if (wfRestClient.isActivitiEnabledForUsers()) {
-            noActivitiEnabledForUsers.setVisible(false);
-        } else {
-            workflowDef.setVisible(false);
-        }
-
-        final Image workflowDefDiagram = new Image("workflowDefDiagram", new Model<IResource>()) {
+        Image workflowDefDiagram = new Image("workflowDefDiagram", new Model<IResource>()) {
 
             private static final long serialVersionUID = -8457850449086490660L;
 
@@ -73,7 +67,16 @@ public class Workflow extends BasePage {
         workflowDefDiagram.setOutputMarkupId(true);
         workflowDef.add(workflowDefDiagram);
 
-        add(new WorkflowTogglePanel("togglePanel", getPageReference(), workflowDefDiagram));
+        WorkflowTogglePanel togglePanel =
+                new WorkflowTogglePanel("togglePanel", getPageReference(), workflowDefDiagram);
+        togglePanel.setOutputMarkupId(true);
+        workflowDef.add(togglePanel);
+
+        if (wfRestClient.isActivitiEnabledForUsers()) {
+            noActivitiEnabledForUsers.setVisible(false);
+        } else {
+            workflowDef.setVisible(false);
+        }
 
         MetaDataRoleAuthorizationStrategy.authorize(workflowDef, ENABLE, StandardEntitlement.WORKFLOW_DEF_READ);
         add(workflowDef);

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd757e36/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 7993076..dc877f0 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
@@ -46,15 +46,8 @@ public class WorkflowTogglePanel extends TogglePanel<String> {
 
     private final WebMarkupContainer container;
 
-    private final PageReference pageRef;
-
-    private final Image workflowDefDiagram;
-
     public WorkflowTogglePanel(final String id, final PageReference pageRef, final Image workflowDefDiagram) {
         super(id);
-        this.pageRef = pageRef;
-        this.workflowDefDiagram = workflowDefDiagram;
-
         modal.size(Modal.Size.Large);
 
         container = new WebMarkupContainer("container");

http://git-wip-us.apache.org/repos/asf/syncope/blob/bd757e36/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html
index 5a49ee8..97ce580 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html
@@ -25,10 +25,10 @@ under the License.
         <span wicket:id="noActivitiEnabledForUsers"><i><wicket:message key="noActivitiEnabledForUsers"/></i></span>
         <span wicket:id="workflowDefContainer">
           <img wicket:id="workflowDefDiagram" style="width: 100%;"/>
+          <span wicket:id="togglePanel"/>
         </span>
       </div>
     </section>
 
-    <span wicket:id="togglePanel"/>
   </wicket:extend>
 </html>
\ No newline at end of file