Do not show the Configuration > Workflow menu item is Activiti was not enabled
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d58f4490 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d58f4490 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d58f4490 Branch: refs/heads/SYNCOPE-808 Commit: d58f4490af294c6f652766ffec980d16c4048909 Parents: dd9489d Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Wed Feb 22 18:58:38 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Wed Feb 22 18:58:38 2017 +0100 ---------------------------------------------------------------------- .../apache/syncope/client/console/pages/BasePage.java | 3 +++ .../apache/syncope/client/console/pages/Workflow.java | 11 +++++------ 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/d58f4490/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java index dee1ee1..787990c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java @@ -189,6 +189,9 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware { confLIContainer.add(confULContainer); liContainer = new WebMarkupContainer(getLIContainerId("workflow")); + liContainer.setOutputMarkupPlaceholderTag(true); + liContainer.setVisible( + SyncopeConsoleSession.get().getPlatformInfo().getUserWorkflowAdapter().contains("Activiti")); confULContainer.add(liContainer); link = BookmarkablePageLinkBuilder.build("workflow", Workflow.class); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.ENABLE, StandardEntitlement.WORKFLOW_DEF_READ); http://git-wip-us.apache.org/repos/asf/syncope/blob/d58f4490/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 3746c0d..a9e0b14 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 @@ -39,6 +39,9 @@ public class Workflow extends BasePage { public Workflow(final PageParameters parameters) { super(parameters); + final boolean isActivitiEnabledForUsers = + SyncopeConsoleSession.get().getPlatformInfo().getUserWorkflowAdapter().contains("Activiti"); + WebMarkupContainer noActivitiEnabledForUsers = new WebMarkupContainer("noActivitiEnabledForUsers"); noActivitiEnabledForUsers.setOutputMarkupPlaceholderTag(true); body.add(noActivitiEnabledForUsers); @@ -58,7 +61,7 @@ public class Workflow extends BasePage { @Override protected byte[] getImageData(final IResource.Attributes attributes) { - return isActivitiEnabledForUsers() + return isActivitiEnabledForUsers ? wfRestClient.getDiagram() : new byte[0]; } @@ -73,7 +76,7 @@ public class Workflow extends BasePage { togglePanel.setOutputMarkupId(true); workflowDef.add(togglePanel); - if (isActivitiEnabledForUsers()) { + if (isActivitiEnabledForUsers) { noActivitiEnabledForUsers.setVisible(false); } else { workflowDef.setVisible(false); @@ -82,8 +85,4 @@ public class Workflow extends BasePage { MetaDataRoleAuthorizationStrategy.authorize(workflowDef, ENABLE, StandardEntitlement.WORKFLOW_DEF_READ); body.add(workflowDef); } - - private boolean isActivitiEnabledForUsers() { - return SyncopeConsoleSession.get().getPlatformInfo().getUserWorkflowAdapter().contains("Activiti"); - } }
