You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by ma...@apache.org on 2015/12/22 16:36:15 UTC
syncope git commit: Menù bugfix: SYNCOPE-156
Repository: syncope
Updated Branches:
refs/heads/master 2a75cf3b6 -> 656156454
Menù bugfix: SYNCOPE-156
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/65615645
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/65615645
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/65615645
Branch: refs/heads/master
Commit: 656156454209711641b938d3ed1f16774999f295
Parents: 2a75cf3
Author: Massimiliano Perrone <ma...@tirasa.net>
Authored: Tue Dec 22 16:35:47 2015 +0100
Committer: Massimiliano Perrone <ma...@tirasa.net>
Committed: Tue Dec 22 16:35:52 2015 +0100
----------------------------------------------------------------------
.../syncope/client/console/pages/BasePage.java | 32 ++++++++++----------
.../client/console/pages/SecurityQuestions.java | 15 +++------
.../syncope/client/console/pages/BasePage.html | 4 +--
3 files changed, 23 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/65615645/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 b034eda..79b4dbe 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
@@ -49,14 +49,6 @@ public class BasePage extends AbstractBasePage implements IAjaxIndicatorAware {
this(null);
}
- private String getLIContainerId(final String linkId) {
- return linkId + "LI";
- }
-
- private String getULContainerId(final String linkId) {
- return linkId + "UL";
- }
-
public BasePage(final PageParameters parameters) {
super(parameters);
@@ -102,12 +94,6 @@ public class BasePage extends AbstractBasePage implements IAjaxIndicatorAware {
MetaDataRoleAuthorizationStrategy.authorize(
liContainer, WebPage.RENDER, StandardEntitlement.CONFIGURATION_LIST);
- liContainer = new WebMarkupContainer(getLIContainerId("securityQuestions"));
- confULContainer.add(liContainer);
- final BookmarkablePageLink<Page> securityQuestionLink = new BookmarkablePageLink<>(
- "securityQuestions", SecurityQuestions.class);
- liContainer.add(securityQuestionLink);
-
liContainer = new WebMarkupContainer(getLIContainerId("workflow"));
confULContainer.add(liContainer);
final BookmarkablePageLink<Page> workflowLink = new BookmarkablePageLink<>("workflow", Workflow.class);
@@ -122,6 +108,12 @@ public class BasePage extends AbstractBasePage implements IAjaxIndicatorAware {
liContainer.add(logsLink);
MetaDataRoleAuthorizationStrategy.authorize(liContainer, WebPage.RENDER, StandardEntitlement.LOG_LIST);
+ liContainer = new WebMarkupContainer(getLIContainerId("securityquestions"));
+ confULContainer.add(liContainer);
+ final BookmarkablePageLink<Page> secuityQuestionsLink = new BookmarkablePageLink<>("securityquestions",
+ SecurityQuestions.class);
+ liContainer.add(secuityQuestionsLink);
+
liContainer = new WebMarkupContainer(getLIContainerId("types"));
confULContainer.add(liContainer);
BookmarkablePageLink<Page> typesLink = new BookmarkablePageLink<>("types", Types.class);
@@ -142,9 +134,9 @@ public class BasePage extends AbstractBasePage implements IAjaxIndicatorAware {
liContainer.add(new BookmarkablePageLink<>("notifications", Notifications.class));
MetaDataRoleAuthorizationStrategy.authorize(liContainer, WebPage.RENDER, StandardEntitlement.NOTIFICATION_LIST);
- liContainer = new WebMarkupContainer(getLIContainerId("camelRoutes"));
+ liContainer = new WebMarkupContainer(getLIContainerId("camelroutes"));
add(liContainer);
- liContainer.add(new BookmarkablePageLink<>("camelRoutes", CamelRoutes.class));
+ liContainer.add(new BookmarkablePageLink<>("camelroutes", CamelRoutes.class));
add(new Label("domain", SyncopeConsoleSession.get().getDomain()));
add(new BookmarkablePageLink<Page>("logout", Logout.class));
@@ -194,6 +186,14 @@ public class BasePage extends AbstractBasePage implements IAjaxIndicatorAware {
}
}
+ private String getLIContainerId(final String linkId) {
+ return linkId + "LI";
+ }
+
+ private String getULContainerId(final String linkId) {
+ return linkId + "UL";
+ }
+
@Override
public String getAjaxIndicatorMarkupId() {
return "veil";
http://git-wip-us.apache.org/repos/asf/syncope/blob/65615645/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java
index 77cb8d5..9f30062 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java
@@ -21,7 +21,6 @@ package org.apache.syncope.client.console.pages;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
-import org.apache.syncope.client.console.panels.ModalPanel;
import org.apache.syncope.client.console.panels.SecurityQuestionModalPanel;
import org.apache.syncope.client.console.panels.SecurityQuestionsPanel;
import org.apache.syncope.client.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
@@ -65,15 +64,17 @@ public class SecurityQuestions extends BasePage {
@Override
protected void onClickInternal(final AjaxRequestTarget target) {
securityQuestionModal.header(new ResourceModel("createSecurityQuestion"));
- target.add(securityQuestionModal.setContent(buildModalPanel()));
+ securityQuestionModal.setFormModel(new SecurityQuestionTO());
+ securityQuestionModal.size(Modal.Size.Large);
+ target.add(securityQuestionModal.setContent(
+ new SecurityQuestionModalPanel(securityQuestionModal, getPageReference(), true)));
securityQuestionModal.addSumbitButton();
securityQuestionModal.show(true);
}
};
content.add(createLink);
- if (SyncopeConsoleSession.get()
- .owns(StandardEntitlement.SECURITY_QUESTION_CREATE)) {
+ if (SyncopeConsoleSession.get().owns(StandardEntitlement.SECURITY_QUESTION_CREATE)) {
MetaDataRoleAuthorizationStrategy.authorize(
createLink, ENABLE, StandardEntitlement.SECURITY_QUESTION_CREATE);
}
@@ -85,12 +86,6 @@ public class SecurityQuestions extends BasePage {
content.add(securityQuestionsPanel);
}
- private ModalPanel buildModalPanel() {
- securityQuestionModal.setFormModel(new SecurityQuestionTO());
- securityQuestionModal.size(Modal.Size.Large);
- return new SecurityQuestionModalPanel(securityQuestionModal, getPageReference(), true);
- }
-
private void addWindowWindowClosedCallback(final BaseModal<?> modal) {
modal.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/65615645/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
index 99aedd5..1987fcb 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
@@ -111,7 +111,7 @@ under the License.
<a href="#"><i class="fa fa-edit"></i><span>Configuration</span> <i class="fa fa-angle-left pull-right"></i></a>
<ul wicket:id="configurationUL" class="treeview-menu">
<li wicket:id="policiesLI"><a href="#" wicket:id="policies"><i class="fa fa-circle-o"></i>Policies</a></li>
- <li wicket:id="securityQuestionsLI"><a href="#" wicket:id="securityQuestions"><i class="fa fa-circle-o"></i>Security Questions</a></li>
+ <li wicket:id="securityquestionsLI"><a href="#" wicket:id="securityquestions"><i class="fa fa-circle-o"></i>Security Questions</a></li>
<li wicket:id="workflowLI"><a href="#" wicket:id="workflow"><i class="fa fa-circle-o"></i>Workflow</a></li>
<li wicket:id="logsLI"><a href="#" wicket:id="logs"><i class="fa fa-circle-o"></i>Logs</a></li>
<li wicket:id="layoutsLI"><a href="#" wicket:id="layouts"><i class="fa fa-circle-o"></i>Layouts</a></li>
@@ -122,7 +122,7 @@ under the License.
<li class="treeview">
<a href="#"><i class="fa fa-laptop"></i><span>Extensions</span> <i class="fa fa-angle-left pull-right"></i></a>
<ul class="treeview-menu">
- <li wicket:id="camelRoutesLI"><a href="#" wicket:id="camelRoutes"><i class="fa fa-circle-o"></i>Camel Routes</a></li>
+ <li wicket:id="camelroutesLI"><a href="#" wicket:id="camelroutes"><i class="fa fa-circle-o"></i>Camel Routes</a></li>
</ul>
</li>
</ul>