Repository: syncope Updated Branches: refs/heads/master 915f3c325 -> 5140ac157
[SYNCOPE-744] Minor fix to the completeness widget Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6001e393 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6001e393 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6001e393 Branch: refs/heads/master Commit: 6001e3939acadf724147ff44f2ee0ddf33f28f60 Parents: 915f3c3 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Feb 19 17:02:17 2016 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Feb 19 17:02:17 2016 +0100 ---------------------------------------------------------------------- .../console/widgets/CompletenessWidget.java | 20 ++++++++++++++------ .../console/widgets/CompletenessWidget.html | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/6001e393/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java index 972768f..31ced75 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java @@ -32,6 +32,7 @@ import org.apache.syncope.common.lib.info.NumbersInfo; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.wicket.Page; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; +import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.model.Model; @@ -65,9 +66,16 @@ public class CompletenessWidget extends AbstractWidget { add(new DoughnutChartPanel("chart", Model.of(doughnut))); + WebMarkupContainer actions = new WebMarkupContainer("actions"); + actions.setOutputMarkupPlaceholderTag(true); + if (todo == 0) { + actions.setVisible(false); + } + add(actions); + BookmarkablePageLink<Page> link = BookmarkablePageLinkBuilder.build("topology", Topology.class); link.setOutputMarkupPlaceholderTag(true); - add(link); + actions.add(link); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.ENABLE, String.format("%s,%s", StandardEntitlement.CONNECTOR_LIST, StandardEntitlement.RESOURCE_LIST)); if (confCompleteness.get(NumbersInfo.ConfItem.RESOURCE) @@ -79,7 +87,7 @@ public class CompletenessWidget extends AbstractWidget { link = BookmarkablePageLinkBuilder.build("policies", Policies.class); link.setOutputMarkupPlaceholderTag(true); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.ENABLE, StandardEntitlement.POLICY_LIST); - add(link); + actions.add(link); if (confCompleteness.get(NumbersInfo.ConfItem.ACCOUNT_POLICY) || confCompleteness.get(NumbersInfo.ConfItem.PASSWORD_POLICY)) { @@ -89,7 +97,7 @@ public class CompletenessWidget extends AbstractWidget { link = BookmarkablePageLinkBuilder.build("notifications", Notifications.class); link.setOutputMarkupPlaceholderTag(true); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.ENABLE, StandardEntitlement.NOTIFICATION_LIST); - add(link); + actions.add(link); if (confCompleteness.get(NumbersInfo.ConfItem.NOTIFICATION)) { link.setVisible(false); } @@ -97,7 +105,7 @@ public class CompletenessWidget extends AbstractWidget { link = BookmarkablePageLinkBuilder.build("types", Types.class); link.setOutputMarkupPlaceholderTag(true); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.ENABLE, StandardEntitlement.SCHEMA_LIST); - add(link); + actions.add(link); if (confCompleteness.get(NumbersInfo.ConfItem.VIR_SCHEMA) || confCompleteness.get(NumbersInfo.ConfItem.ANY_TYPE)) { @@ -106,7 +114,7 @@ public class CompletenessWidget extends AbstractWidget { link = BookmarkablePageLinkBuilder.build("securityquestions", SecurityQuestions.class); link.setOutputMarkupPlaceholderTag(true); - add(link); + actions.add(link); if (confCompleteness.get(NumbersInfo.ConfItem.SECURITY_QUESTION)) { link.setVisible(false); } @@ -114,7 +122,7 @@ public class CompletenessWidget extends AbstractWidget { link = BookmarkablePageLinkBuilder.build("roles", Roles.class); link.setOutputMarkupPlaceholderTag(true); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.ENABLE, StandardEntitlement.ROLE_LIST); - add(link); + actions.add(link); if (confCompleteness.get(NumbersInfo.ConfItem.ROLE)) { link.setVisible(false); } http://git-wip-us.apache.org/repos/asf/syncope/blob/6001e393/client/console/src/main/resources/org/apache/syncope/client/console/widgets/CompletenessWidget.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/CompletenessWidget.html b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/CompletenessWidget.html index c57d40b..acc12b3 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/CompletenessWidget.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/CompletenessWidget.html @@ -22,7 +22,7 @@ under the License. <div class="box-header with-border"> <h3 class="box-title"><wicket:message key="configurationStatus"/></h3> <div class="box-tools pull-right"> - <div class="btn-group"> + <div class="btn-group" wicket:id="actions"> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"> <i class="fa fa-wrench"></i> </button>
