[SYNCOPE-1014] CloseWindowsCallback missing
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7419f26a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7419f26a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7419f26a Branch: refs/heads/SYNCOPE-808 Commit: 7419f26a814405e020f20e3a8080d25a3bb008bb Parents: 72d5bda Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Sun Feb 12 14:24:40 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Sun Feb 12 14:24:40 2017 +0100 ---------------------------------------------------------------------- .../console/approvals/ApprovalDirectoryPanel.java | 2 +- .../client/console/commons/TaskDataProvider.java | 2 +- .../syncope/client/console/panels/ParametersPanel.java | 2 +- .../client/console/panels/SecurityQuestionsPanel.java | 12 ++++++++++++ .../console/panels/TypeExtensionDirectoryPanel.java | 2 +- .../client/console/policies/PolicyDirectoryPanel.java | 2 +- .../console/policies/PolicyRuleDirectoryPanel.java | 2 +- .../client/console/reports/ReportDirectoryPanel.java | 2 +- .../client/console/reports/ReportletDirectoryPanel.java | 2 +- .../client/console/tasks/SchedTaskDirectoryPanel.java | 2 +- .../client/console/tasks/TaskDirectoryPanel.java | 2 +- 11 files changed, 22 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java index b515d19..61519ea 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java @@ -191,7 +191,7 @@ public class ApprovalDirectoryPanel public ApprovalProvider(final int paginatorRows) { super(paginatorRows); - setSort("createTime", SortOrder.DESCENDING); + setSort("createTime", SortOrder.ASCENDING); this.comparator = new SortableDataProviderComparator<>(this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java index a03f30e..5e917d1 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java @@ -39,7 +39,7 @@ public abstract class TaskDataProvider<T extends AbstractTaskTO> extends Directo super(paginatorRows); this.taskRestClient = taskRestClient; - setSort("start", SortOrder.DESCENDING); + setSort("start", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); this.taskType = taskType; } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java index 5d38339..29de93c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java @@ -214,7 +214,7 @@ public class ParametersPanel extends DirectoryPanel< private ParametersProvider(final int paginatorRows) { super(paginatorRows); - setSort("schema", SortOrder.DESCENDING); + setSort("schema", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java index a86c0ed..d4c9af7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java @@ -46,6 +46,7 @@ import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.event.Broadcast; +import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.model.CompoundPropertyModel; @@ -69,6 +70,17 @@ public class SecurityQuestionsPanel extends DirectoryPanel< } }.disableCheckBoxes()); + modal.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() { + + private static final long serialVersionUID = 8804221891699487139L; + + @Override + public void onClose(final AjaxRequestTarget target) { + modal.show(false); + target.add(container); + } + }); + this.addNewItemPanelBuilder( new AbstractModalPanelBuilder<SecurityQuestionTO>(new SecurityQuestionTO(), pageRef) { http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java index 6c4442f..5333eef 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java @@ -179,7 +179,7 @@ public class TypeExtensionDirectoryPanel public TypeExtensionDataProvider(final int paginatorRows) { super(paginatorRows); - setSort("anyKey", SortOrder.DESCENDING); + setSort("anyKey", SortOrder.ASCENDING); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java index 16d0e42..21e63cd 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java @@ -241,7 +241,7 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO> public PolicyDataProvider(final int paginatorRows) { super(paginatorRows); - setSort("description", SortOrder.DESCENDING); + setSort("description", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java index 2e9700d..cb5969a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java @@ -233,7 +233,7 @@ public class PolicyRuleDirectoryPanel<T extends AbstractPolicyTO> extends Direct super(paginatorRows); //Default sorting - setSort("name", SortOrder.DESCENDING); + setSort("name", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java index 95cd801..6237c4f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java @@ -252,7 +252,7 @@ public abstract class ReportDirectoryPanel public ReportDataProvider(final int paginatorRows) { super(paginatorRows); - setSort("key", SortOrder.DESCENDING); + setSort("name", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java index cf33051..94aeec9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java @@ -236,7 +236,7 @@ public class ReportletDirectoryPanel extends DirectoryPanel< super(paginatorRows); //Default sorting - setSort("name", SortOrder.DESCENDING); + setSort("name", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java index b43a346..7ad6360 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java @@ -315,7 +315,7 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO> public SchedTasksProvider(final Class<T> reference, final TaskType id, final int paginatorRows) { super(paginatorRows, id, restClient); - setSort("name", SortOrder.DESCENDING); + setSort("name", SortOrder.ASCENDING); this.reference = reference; } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java index 39036e5..383807e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java @@ -77,7 +77,7 @@ public abstract class TaskDirectoryPanel<T extends AbstractTaskTO> public TasksProvider(final int paginatorRows, final TaskType id) { super(paginatorRows); - setSort("key", SortOrder.DESCENDING); + setSort("key", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); this.id = id; }
