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 10:51:29 UTC
syncope git commit: Logs page and security question bugfix,
SYNCOPE-156
Repository: syncope
Updated Branches:
refs/heads/master d2f2b1ad1 -> 84445355e
Logs page and security question 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/84445355
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/84445355
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/84445355
Branch: refs/heads/master
Commit: 84445355e10776b8db5721691004ba109336b68e
Parents: d2f2b1a
Author: Massimiliano Perrone <ma...@tirasa.net>
Authored: Tue Dec 22 10:43:15 2015 +0100
Committer: Massimiliano Perrone <ma...@tirasa.net>
Committed: Tue Dec 22 10:51:18 2015 +0100
----------------------------------------------------------------------
.../syncope/client/console/pages/BasePage.java | 2 --
.../client/console/pages/SecurityQuestions.java | 16 +++++++++++-----
.../panels/SecurityQuestionDetailsPanel.java | 5 +----
.../apache/syncope/client/console/pages/Logs.html | 2 --
4 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/84445355/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 9b50853..65a2c35 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
@@ -100,8 +100,6 @@ public class BasePage extends AbstractBasePage implements IAjaxIndicatorAware {
confULContainer.add(liContainer);
final BookmarkablePageLink<Page> securityQuestionLink = new BookmarkablePageLink<>(
"securityQuestions", SecurityQuestions.class);
- MetaDataRoleAuthorizationStrategy.authorize(
- securityQuestionLink, WebPage.ENABLE, StandardEntitlement.SECURITY_QUESTION_CREATE);
liContainer.add(securityQuestionLink);
liContainer = new WebMarkupContainer(getLIContainerId("workflow"));
http://git-wip-us.apache.org/repos/asf/syncope/blob/84445355/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 d58e369..77cb8d5 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,6 +21,7 @@ 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;
@@ -42,6 +43,8 @@ public class SecurityQuestions extends BasePage {
private final SecurityQuestionsPanel securityQuestionsPanel;
+ private final BaseModal<SecurityQuestionTO> securityQuestionModal;
+
public SecurityQuestions(final PageParameters parameters) {
super(parameters);
@@ -50,9 +53,7 @@ public class SecurityQuestions extends BasePage {
content.setOutputMarkupId(true);
add(content);
- final BaseModal<SecurityQuestionTO> securityQuestionModal = new BaseModal<>("securityQuestionModal");
- securityQuestionModal.setFormModel(new SecurityQuestionTO());
- securityQuestionModal.size(Modal.Size.Large);
+ securityQuestionModal = new BaseModal<>("securityQuestionModal");
addWindowWindowClosedCallback(securityQuestionModal);
add(securityQuestionModal);
@@ -64,8 +65,7 @@ public class SecurityQuestions extends BasePage {
@Override
protected void onClickInternal(final AjaxRequestTarget target) {
securityQuestionModal.header(new ResourceModel("createSecurityQuestion"));
- target.add(securityQuestionModal.setContent(
- new SecurityQuestionModalPanel(securityQuestionModal, getPageReference(), true)));
+ target.add(securityQuestionModal.setContent(buildModalPanel()));
securityQuestionModal.addSumbitButton();
securityQuestionModal.show(true);
}
@@ -85,6 +85,12 @@ 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/84445355/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java
index bef4212..b6ab809 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java
@@ -38,8 +38,7 @@ public class SecurityQuestionDetailsPanel extends Panel {
final WebMarkupContainer container = new WebMarkupContainer("container");
- container.setOutputMarkupId(
- true);
+ container.setOutputMarkupId(true);
add(container);
final Form<SecurityQuestionTO> form = new Form<>("form");
@@ -58,8 +57,6 @@ public class SecurityQuestionDetailsPanel extends Panel {
final AjaxTextFieldPanel content = new AjaxTextFieldPanel(
"content", getString("content"), new PropertyModel<String>(securityQuestionTO, "content"));
content.addRequiredLabel();
- content.setEnabled(true);
- content.setVisible(true);
form.add(content);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/84445355/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html
index 2d2ac1f..84c78d5 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html
@@ -35,7 +35,5 @@ under the License.
</div>
</div>
</div>
- <div wicket:id="coreLogModal"></div>
- <div wicket:id="consoleLogModal"></div>
</wicket:extend>
</html>
\ No newline at end of file