You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/01/15 10:25:25 UTC
svn commit: r1558323 - in /syncope/trunk: ./
console/src/main/java/org/apache/syncope/console/
console/src/main/java/org/apache/syncope/console/commons/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/co...
Author: ilgrosso
Date: Wed Jan 15 09:25:24 2014
New Revision: 1558323
URL: http://svn.apache.org/r1558323
Log:
[SYNCOPE_476] Merge from 1_1_X
Added:
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/PageUtils.java
- copied unchanged from r1558319, syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/commons/PageUtils.java
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1558004-1558319
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java Wed Jan 15 09:25:24 2014
@@ -21,6 +21,7 @@ package org.apache.syncope.console;
import java.io.Serializable;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.console.commons.Constants;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.console.commons.XMLRolesReader;
import org.apache.syncope.console.pages.Configuration;
import org.apache.syncope.console.pages.InfoModalPage;
@@ -252,7 +253,7 @@ public class SyncopeApplication
@Override
public Page createPage() {
- return new UserSelfModalPage(page.getPageReference(), editProfileModalWin, userTO);
+ return new UserSelfModalPage(PageUtils.getPageReference(page), editProfileModalWin, userTO);
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java Wed Jan 15 09:25:24 2014
@@ -33,6 +33,7 @@ import org.apache.syncope.common.to.Work
import org.apache.syncope.common.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.MapChoiceRenderer;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.rest.ApprovalRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
@@ -174,8 +175,8 @@ public class ApprovalModalPage extends B
@Override
public Page createPage() {
- return new ViewUserModalPage(ApprovalModalPage.this.getPageReference(), editUserWin,
- userRestClient.read(formTO.getUserId())) {
+ return new ViewUserModalPage(PageUtils.getPageReference(ApprovalModalPage.this),
+ editUserWin, userRestClient.read(formTO.getUserId())) {
private static final long serialVersionUID = -2819994749866481607L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java Wed Jan 15 09:25:24 2014
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.syncope.common.reqres.BulkAction;
import org.apache.syncope.common.reqres.BulkActionResult;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.console.rest.BaseRestClient;
import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
@@ -83,7 +84,8 @@ public class BulkActionModalPage<T, S> e
dataProvider,
Integer.MAX_VALUE).setVisible(items != null && !items.isEmpty()));
- final ActionLinksPanel actionPanel = new ActionLinksPanel("actions", new Model(), getPageReference());
+ final ActionLinksPanel actionPanel = new ActionLinksPanel("actions", new Model(),
+ PageUtils.getPageReference(getPage()));
add(actionPanel);
for (ActionLink.ActionType action : actions) {
@@ -138,8 +140,8 @@ public class BulkActionModalPage<T, S> e
final Form<Void> form = new Form<Void>(FORM);
add(form);
- final AjaxButton cancel =
- new ClearIndicatingAjaxButton(CANCEL, new ResourceModel(CANCEL), getPageReference()) {
+ final AjaxButton cancel = new ClearIndicatingAjaxButton(CANCEL, new ResourceModel(CANCEL),
+ PageUtils.getPageReference(getPage())) {
private static final long serialVersionUID = -958724007591692537L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java Wed Jan 15 09:25:24 2014
@@ -29,6 +29,7 @@ import org.apache.logging.log4j.LogManag
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.syncope.common.SyncopeConstants;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.ConfigurationTO;
import org.apache.syncope.common.to.LoggerTO;
import org.apache.syncope.common.to.NotificationTO;
@@ -137,9 +138,9 @@ public class Configuration extends BaseP
add(editConfigWin = new ModalWindow("editConfigurationWin"));
setupSyncopeConf();
- add(new PoliciesPanel("passwordPoliciesPanel", getPageReference(), PolicyType.PASSWORD));
- add(new PoliciesPanel("accountPoliciesPanel", getPageReference(), PolicyType.ACCOUNT));
- add(new PoliciesPanel("syncPoliciesPanel", getPageReference(), PolicyType.SYNC));
+ add(new PoliciesPanel("passwordPoliciesPanel", PageUtils.getPageReference(getPage()), PolicyType.PASSWORD));
+ add(new PoliciesPanel("accountPoliciesPanel", PageUtils.getPageReference(getPage()), PolicyType.ACCOUNT));
+ add(new PoliciesPanel("syncPoliciesPanel", PageUtils.getPageReference(getPage()), PolicyType.SYNC));
add(createNotificationWin = new ModalWindow("createNotificationWin"));
add(editNotificationWin = new ModalWindow("editNotificationWin"));
@@ -255,7 +256,8 @@ public class Configuration extends BaseP
final ConfigurationTO configurationTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
@@ -270,8 +272,8 @@ public class Configuration extends BaseP
@Override
public Page createPage() {
- return new ConfigurationModalPage(Configuration.this.getPageReference(), editConfigWin,
- configurationTO, false);
+ return new ConfigurationModalPage(PageUtils.getPageReference(Configuration.this),
+ editConfigWin, configurationTO, false);
}
});
@@ -340,8 +342,8 @@ public class Configuration extends BaseP
@Override
public Page createPage() {
- return new ConfigurationModalPage(Configuration.this.getPageReference(), createConfigWin,
- new ConfigurationTO(), true);
+ return new ConfigurationModalPage(PageUtils.getPageReference(Configuration.this),
+ createConfigWin, new ConfigurationTO(), true);
}
});
@@ -432,7 +434,8 @@ public class Configuration extends BaseP
final NotificationTO notificationTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
@@ -447,7 +450,7 @@ public class Configuration extends BaseP
@Override
public Page createPage() {
- return new NotificationModalPage(Configuration.this.getPageReference(),
+ return new NotificationModalPage(PageUtils.getPageReference(Configuration.this),
editNotificationWin, notificationTO, false);
}
});
@@ -517,8 +520,8 @@ public class Configuration extends BaseP
@Override
public Page createPage() {
- return new NotificationModalPage(Configuration.this.getPageReference(), createNotificationWin,
- new NotificationTO(), true);
+ return new NotificationModalPage(PageUtils.getPageReference(Configuration.this),
+ createNotificationWin, new NotificationTO(), true);
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java Wed Jan 15 09:25:24 2014
@@ -21,6 +21,7 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.syncope.common.mod.UserMod;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.util.AttributableOperations;
import org.apache.syncope.console.commons.status.StatusBean;
@@ -60,7 +61,8 @@ public class EditUserModalPage extends U
if (userTO.getId() != 0) {
form.addOrReplace(new Label("pwdChangeInfo", new ResourceModel("pwdChangeInfo")));
- statusPanel = new StatusPanel("statuspanel", userTO, new ArrayList<StatusBean>(), getPageReference());
+ statusPanel = new StatusPanel("statuspanel", userTO, new ArrayList<StatusBean>(),
+ PageUtils.getPageReference(getPage()));
statusPanel.setOutputMarkupId(true);
MetaDataRoleAuthorizationStrategy.authorize(
statusPanel, RENDER, xmlRolesReader.getAllAllowedRoles("Resources", "getConnectorObject"));
@@ -71,7 +73,8 @@ public class EditUserModalPage extends U
form.addOrReplace(new ResourcesPanel.Builder("resources").attributableTO(userTO).statusPanel(
statusPanel).build());
- form.addOrReplace(new MembershipsPanel("memberships", userTO, false, statusPanel, getPageReference()));
+ form.addOrReplace(new MembershipsPanel("memberships", userTO, false, statusPanel,
+ PageUtils.getPageReference(getPage())));
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Wed Jan 15 09:25:24 2014
@@ -21,6 +21,7 @@ package org.apache.syncope.console.pages
import java.security.AccessControlException;
import java.util.List;
import java.util.Locale;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.services.EntitlementService;
import org.apache.syncope.common.wrap.EntitlementTO;
import org.apache.syncope.common.to.UserTO;
@@ -137,39 +138,40 @@ public class Login extends WebPage {
if (userSelfRestClient.isSelfRegistrationAllowed()) {
selfRegFrag = new Fragment("selfRegistration", "selfRegAllowed", this);
- final AjaxLink<Void> selfRegLink = new ClearIndicatingAjaxLink<Void>("link", getPageReference()) {
+ final AjaxLink<Void> selfRegLink = new ClearIndicatingAjaxLink<Void>("link",
+ PageUtils.getPageReference(getPage())) {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- protected void onClickInternal(final AjaxRequestTarget target) {
- editProfileModalWin.setPageCreator(new ModalWindow.PageCreator() {
+ @Override
+ protected void onClickInternal(final AjaxRequestTarget target) {
+ editProfileModalWin.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID = -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- // anonymous authentication needed for self-registration
- authenticate(anonymousUser, anonymousKey);
+ @Override
+ public Page createPage() {
+ // anonymous authentication needed for self-registration
+ authenticate(anonymousUser, anonymousKey);
- return new UserSelfModalPage(
- Login.this.getPageReference(), editProfileModalWin, new UserTO());
- }
- });
+ return new UserSelfModalPage(
+ PageUtils.getPageReference(Login.this), editProfileModalWin, new UserTO());
+ }
+ });
- editProfileModalWin.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
+ editProfileModalWin.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
- private static final long serialVersionUID = 251794406325329768L;
+ private static final long serialVersionUID = 251794406325329768L;
- @Override
- public void onClose(final AjaxRequestTarget target) {
- SyncopeSession.get().invalidate();
- }
- });
+ @Override
+ public void onClose(final AjaxRequestTarget target) {
+ SyncopeSession.get().invalidate();
+ }
+ });
- editProfileModalWin.show(target);
- }
- };
+ editProfileModalWin.show(target);
+ }
+ };
selfRegLink.add(new Label("linkTitle", getString("selfRegistration")));
Panel panel = new LinkPanel("selfRegistration", new ResourceModel("selfRegistration"));
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Wed Jan 15 09:25:24 2014
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.NotificationTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.IntMappingType;
@@ -150,7 +151,7 @@ class NotificationModalPage extends Base
"eventSelection",
loggerRestClient.listEvents(),
new PropertyModel<List<String>>(notificationTO, "events"),
- getPageReference(),
+ PageUtils.getPageReference(getPage()),
"Notification") {
private static final long serialVersionUID = 6429053774964787735L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java Wed Jan 15 09:25:24 2014
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
import org.apache.syncope.common.to.AbstractPolicyTO;
@@ -36,7 +37,6 @@ import org.apache.syncope.common.types.S
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.PolicyBeanPanel;
import org.apache.syncope.console.rest.PolicyRestClient;
-import org.apache.syncope.console.rest.ResourceRestClient;
import org.apache.syncope.console.rest.RoleRestClient;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
@@ -80,9 +80,6 @@ public class PolicyModalPage<T extends A
private PolicyRestClient policyRestClient;
@SpringBean
- private ResourceRestClient resourceRestClient;
-
- @SpringBean
private RoleRestClient roleRestClient;
public PolicyModalPage(final ModalWindow window, final T policyTO) {
@@ -168,7 +165,8 @@ public class PolicyModalPage<T extends A
final String resource = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
private static final long serialVersionUID = -3722207913631435501L;
@@ -181,7 +179,7 @@ public class PolicyModalPage<T extends A
@Override
public Page createPage() {
- return new ResourceModalPage(PolicyModalPage.this.getPageReference(),
+ return new ResourceModalPage(PageUtils.getPageReference(PolicyModalPage.this),
mwindow, resourceRestClient.read(resource), false);
}
});
@@ -240,7 +238,8 @@ public class PolicyModalPage<T extends A
final RoleTO role = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
private static final long serialVersionUID = -3722207913631435501L;
@@ -253,7 +252,8 @@ public class PolicyModalPage<T extends A
@Override
public Page createPage() {
- return new RoleModalPage(PolicyModalPage.this.getPageReference(), mwindow, role);
+ return new RoleModalPage(
+ PageUtils.getPageReference(PolicyModalPage.this), mwindow, role);
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java Wed Jan 15 09:25:24 2014
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.report.AbstractReportletConf;
import org.apache.syncope.common.report.ReportletConf;
import org.apache.syncope.common.to.ReportExecTO;
@@ -123,7 +124,7 @@ public class ReportModalPage extends Bas
form.add(crontab);
final AjaxButton submit =
- new ClearIndicatingAjaxButton(APPLY, new ResourceModel(APPLY), getPageReference()) {
+ new ClearIndicatingAjaxButton(APPLY, new ResourceModel(APPLY), PageUtils.getPageReference(getPage())) {
private static final long serialVersionUID = -958724007591692537L;
@@ -167,8 +168,8 @@ public class ReportModalPage extends Bas
form.add(submit);
- final AjaxButton cancel =
- new ClearIndicatingAjaxButton(CANCEL, new ResourceModel(CANCEL), getPageReference()) {
+ final AjaxButton cancel = new ClearIndicatingAjaxButton(CANCEL, new ResourceModel(CANCEL),
+ PageUtils.getPageReference(getPage())) {
private static final long serialVersionUID = -958724007591692537L;
@@ -295,7 +296,7 @@ public class ReportModalPage extends Bas
modalReportletConfOldName = null;
modalReportletConf = null;
return new ReportletConfModalPage(null, reportletConfWin,
- ReportModalPage.this.getPageReference());
+ PageUtils.getPageReference(ReportModalPage.this));
}
});
reportletConfWin.show(target);
@@ -318,7 +319,7 @@ public class ReportModalPage extends Bas
modalReportletConfOldName = reportlets.getModelObject().getName();
modalReportletConf = null;
return new ReportletConfModalPage(reportlets.getModelObject(), reportletConfWin,
- ReportModalPage.this.getPageReference());
+ PageUtils.getPageReference(ReportModalPage.this));
}
});
reportletConfWin.show(target);
@@ -446,7 +447,8 @@ public class ReportModalPage extends Bas
final ReportExecTO taskExecutionTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
@@ -481,7 +483,7 @@ public class ReportModalPage extends Bas
public Page createPage() {
ReportModalPage.this.exportExecId = model.getObject().getId();
return new ReportExecResultDownloadModalPage(reportExecExportWin,
- ReportModalPage.this.getPageReference());
+ PageUtils.getPageReference(ReportModalPage.this));
}
});
reportExecExportWin.show(target);
@@ -515,7 +517,8 @@ public class ReportModalPage extends Bas
@Override
public Component getHeader(final String componentId) {
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(), getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(),
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Wed Jan 15 09:25:24 2014
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.EventCategoryTO;
import org.apache.syncope.common.to.ReportTO;
import org.apache.syncope.common.types.AuditElements.Result;
@@ -132,7 +133,8 @@ public class Reports extends BasePage {
final ReportTO reportTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, PageUtils.getPageReference(
+ getPage()));
panel.add(new ActionLink() {
@@ -147,7 +149,7 @@ public class Reports extends BasePage {
@Override
public Page createPage() {
- return new ReportModalPage(window, reportTO, Reports.this.getPageReference());
+ return new ReportModalPage(window, reportTO, PageUtils.getPageReference(Reports.this));
}
});
@@ -195,7 +197,8 @@ public class Reports extends BasePage {
@Override
public Component getHeader(final String componentId) {
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(), getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(),
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
@@ -249,7 +252,7 @@ public class Reports extends BasePage {
paginatorForm.add(rowsChooser);
add(paginatorForm);
- AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", getPageReference()) {
+ AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", PageUtils.getPageReference(getPage())) {
private static final long serialVersionUID = -7978723352517770644L;
@@ -261,7 +264,7 @@ public class Reports extends BasePage {
@Override
public Page createPage() {
- return new ReportModalPage(window, new ReportTO(), Reports.this.getPageReference());
+ return new ReportModalPage(window, new ReportTO(), PageUtils.getPageReference(Reports.this));
}
});
@@ -302,7 +305,7 @@ public class Reports extends BasePage {
final ListModel<String> model = new ListModel<String>(new ArrayList<String>(events));
form.add(new LoggerCategoryPanel(
- "events", loggerRestClient.listEvents(), model, getPageReference(), "Reports") {
+ "events", loggerRestClient.listEvents(), model, PageUtils.getPageReference(getPage()), "Reports") {
private static final long serialVersionUID = 6113164334533550277L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java Wed Jan 15 09:25:24 2014
@@ -29,6 +29,7 @@ import org.apache.syncope.common.to.Role
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.console.commons.PreferenceManager;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
@@ -129,7 +130,7 @@ public class Resources extends BasePage
statusmodal.setCookieName("status-modal");
add(statusmodal);
- AjaxLink<Void> reloadLink = new ClearIndicatingAjaxLink<Void>("reloadLink", getPageReference()) {
+ AjaxLink<Void> reloadLink = new ClearIndicatingAjaxLink<Void>("reloadLink", PageUtils.getPageReference(this)) {
private static final long serialVersionUID = 3109256773218160485L;
@@ -189,7 +190,7 @@ public class Resources extends BasePage
final IModel<ResourceTO> rowModel) {
final AjaxLink<String> editLink =
- new ClearIndicatingAjaxLink<String>("link", getPageReference()) {
+ new ClearIndicatingAjaxLink<String>("link", PageUtils.getPageReference(Resources.this)) {
private static final long serialVersionUID = -7978723352517770644L;
@@ -202,7 +203,7 @@ public class Resources extends BasePage
@Override
public Page createPage() {
- return new ConnectorModalPage(Resources.this.getPageReference(),
+ return new ConnectorModalPage(PageUtils.getPageReference(Resources.this),
editConnectorWin,
connectorRestClient.read(rowModel.getObject().getConnectorId()));
}
@@ -244,7 +245,8 @@ public class Resources extends BasePage
final ResourceTO resourceTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(Resources.this));
panel.add(new ActionLink() {
private static final long serialVersionUID = -3722207913631435501L;
@@ -258,7 +260,8 @@ public class Resources extends BasePage
@Override
public Page createPage() {
return new ProvisioningModalPage<UserTO>(
- getPageReference(), statusmodal, model.getObject(), UserTO.class);
+ PageUtils.getPageReference(Resources.this),
+ statusmodal, model.getObject(), UserTO.class);
}
});
@@ -280,7 +283,8 @@ public class Resources extends BasePage
@Override
public Page createPage() {
return new ProvisioningModalPage<RoleTO>(
- getPageReference(), statusmodal, model.getObject(), RoleTO.class);
+ PageUtils.getPageReference(Resources.this),
+ statusmodal, model.getObject(), RoleTO.class);
}
});
@@ -301,7 +305,7 @@ public class Resources extends BasePage
@Override
public Page createPage() {
- return new ResourceModalPage(Resources.this.getPageReference(),
+ return new ResourceModalPage(PageUtils.getPageReference(Resources.this),
editResourceWin, resourceTO, false);
}
});
@@ -343,7 +347,7 @@ public class Resources extends BasePage
resourceRestClient,
"name",
"Resources",
- getPageReference());
+ PageUtils.getPageReference(Resources.this));
resourceContainer = new WebMarkupContainer("resourceContainer");
resourceContainer.add(table);
@@ -365,7 +369,7 @@ public class Resources extends BasePage
editResourceWin.setCookieName("edit-res-modal");
AjaxLink<Void> createResourceLink =
- new ClearIndicatingAjaxLink<Void>("createResourceLink", getPageReference()) {
+ new ClearIndicatingAjaxLink<Void>("createResourceLink", PageUtils.getPageReference(Resources.this)) {
private static final long serialVersionUID = -7978723352517770644L;
@@ -377,8 +381,8 @@ public class Resources extends BasePage
@Override
public Page createPage() {
- final ResourceModalPage windows = new ResourceModalPage(Resources.this.
- getPageReference(),
+ final ResourceModalPage windows = new ResourceModalPage(
+ PageUtils.getPageReference(Resources.this),
editResourceWin, new ResourceTO(), true);
return windows;
}
@@ -446,7 +450,8 @@ public class Resources extends BasePage
final ConnInstanceTO connectorTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(Resources.this));
panel.add(new ActionLink() {
@@ -460,8 +465,8 @@ public class Resources extends BasePage
@Override
public Page createPage() {
- return new ConnectorModalPage(Resources.this.getPageReference(), editConnectorWin,
- connectorTO);
+ return new ConnectorModalPage(PageUtils.getPageReference(Resources.this),
+ editConnectorWin, connectorTO);
}
});
@@ -502,7 +507,7 @@ public class Resources extends BasePage
connectorRestClient,
"id",
"Connectors",
- getPageReference());
+ PageUtils.getPageReference(Resources.this));
connectorContainer = new WebMarkupContainer("connectorContainer");
connectorContainer.add(table);
@@ -527,7 +532,7 @@ public class Resources extends BasePage
editConnectorWin.setCookieName("edit-conn-modal");
AjaxLink<Void> createConnectorLink =
- new ClearIndicatingAjaxLink<Void>("createConnectorLink", getPageReference()) {
+ new ClearIndicatingAjaxLink<Void>("createConnectorLink", PageUtils.getPageReference(Resources.this)) {
private static final long serialVersionUID = -7978723352517770644L;
@@ -539,7 +544,8 @@ public class Resources extends BasePage
@Override
public Page createPage() {
- ConnectorModalPage form = new ConnectorModalPage(Resources.this.getPageReference(),
+ ConnectorModalPage form = new ConnectorModalPage(
+ PageUtils.getPageReference(Resources.this),
editConnectorWin, new ConnInstanceTO());
return form;
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java Wed Jan 15 09:25:24 2014
@@ -25,6 +25,7 @@ import org.apache.syncope.common.mod.Rol
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.util.AttributableOperations;
import org.apache.syncope.console.commons.Constants;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.console.pages.panels.RolePanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -87,7 +88,7 @@ public class RoleModalPage extends BaseM
form.setModel(new CompoundPropertyModel<RoleTO>(roleTO));
this.rolePanel = new RolePanel.Builder("rolePanel").form(form).roleTO(roleTO).
- roleModalPageMode(mode).pageRef(getPageReference()).build();
+ roleModalPageMode(mode).pageRef(PageUtils.getPageReference(this)).build();
form.add(rolePanel);
final AjaxButton submit = new IndicatingAjaxButton(SUBMIT, new ResourceModel(SUBMIT)) {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java Wed Jan 15 09:25:24 2014
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
import org.apache.syncope.console.pages.panels.RoleSearchPanel;
@@ -66,8 +67,8 @@ public class Roles extends BasePage {
treePanel.setOutputMarkupId(true);
add(treePanel);
- final RoleSummaryPanel summaryPanel = new RoleSummaryPanel.Builder("summaryPanel")
- .window(editRoleWin).callerPageRef(Roles.this.getPageReference()).build();
+ final RoleSummaryPanel summaryPanel = new RoleSummaryPanel.Builder("summaryPanel").
+ window(editRoleWin).callerPageRef(PageUtils.getPageReference(Roles.this)).build();
add(summaryPanel);
editRoleWin.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
@@ -94,7 +95,7 @@ public class Roles extends BasePage {
});
final AbstractSearchResultPanel searchResult =
- new RoleSearchResultPanel("searchResult", true, null, getPageReference(), restClient);
+ new RoleSearchResultPanel("searchResult", true, null, PageUtils.getPageReference(getPage()), restClient);
add(searchResult);
final Form searchForm = new Form("searchForm");
@@ -103,26 +104,27 @@ public class Roles extends BasePage {
final RoleSearchPanel searchPanel = new RoleSearchPanel.Builder("searchPanel").build();
searchForm.add(searchPanel);
- searchForm.add(new ClearIndicatingAjaxButton("search", new ResourceModel("search"), getPageReference()) {
+ searchForm.add(new ClearIndicatingAjaxButton("search", new ResourceModel("search"),
+ PageUtils.getPageReference(getPage())) {
- private static final long serialVersionUID = -958724007591692537L;
+ private static final long serialVersionUID = -958724007591692537L;
- @Override
- protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
- final String fiql = searchPanel.buildFIQL();
- LOG.debug("Node condition {}", fiql);
-
- doSearch(target, fiql, searchResult);
-
- Session.get().getFeedbackMessages().clear();
- target.add(searchPanel.getSearchFeedback());
- }
-
- @Override
- protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- target.add(searchPanel.getSearchFeedback());
- }
- });
+ @Override
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
+ final String fiql = searchPanel.buildFIQL();
+ LOG.debug("Node condition {}", fiql);
+
+ doSearch(target, fiql, searchResult);
+
+ Session.get().getFeedbackMessages().clear();
+ target.add(searchPanel.getSearchFeedback());
+ }
+
+ @Override
+ protected void onError(final AjaxRequestTarget target, final Form<?> form) {
+ target.add(searchPanel.getSearchFeedback());
+ }
+ });
}
private void doSearch(final AjaxRequestTarget target, final String fiql,
@@ -144,7 +146,7 @@ public class Roles extends BasePage {
final TreeNodeClickUpdate update = (TreeNodeClickUpdate) event.getPayload();
final RoleSummaryPanel summaryPanel = new RoleSummaryPanel.Builder("summaryPanel")
- .window(editRoleWin).callerPageRef(Roles.this.getPageReference())
+ .window(editRoleWin).callerPageRef(PageUtils.getPageReference(Roles.this))
.selectedNodeId(update.getSelectedNodeId()).build();
addOrReplace(summaryPanel);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java Wed Jan 15 09:25:24 2014
@@ -29,6 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.AbstractSchemaTO;
import org.apache.syncope.common.to.SchemaTO;
import org.apache.syncope.common.types.AttributableType;
@@ -79,7 +80,7 @@ import org.springframework.util.Reflecti
/**
* Schema WebPage.
*/
-@SuppressWarnings({"unchecked", "rawtypes"})
+@SuppressWarnings({ "unchecked", "rawtypes" })
public class Schema extends BasePage {
private static final long serialVersionUID = 8091922398776299403L;
@@ -89,41 +90,41 @@ public class Schema extends BasePage {
private static final long serialVersionUID = 3109256773218160485L;
{
- put(SchemaType.NORMAL, Arrays.asList(new String[] {"name", "type",
- "mandatoryCondition", "uniqueConstraint", "multivalue", "readonly"}));
- put(SchemaType.DERIVED, Arrays.asList(new String[] {"name", "expression"}));
- put(SchemaType.VIRTUAL, Arrays.asList(new String[] {"name", "readonly"}));
+ put(SchemaType.NORMAL, Arrays.asList(new String[] { "name", "type",
+ "mandatoryCondition", "uniqueConstraint", "multivalue", "readonly" }));
+ put(SchemaType.DERIVED, Arrays.asList(new String[] { "name", "expression" }));
+ put(SchemaType.VIRTUAL, Arrays.asList(new String[] { "name", "readonly" }));
}
};
private static final Map<Map.Entry<AttributableType, SchemaType>, String> PAGINATOR_ROWS_KEYS =
new HashMap<Map.Entry<AttributableType, SchemaType>, String>() {
- private static final long serialVersionUID = 3109256773218160485L;
+ private static final long serialVersionUID = 3109256773218160485L;
- {
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.NORMAL),
- Constants.PREF_USER_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.DERIVED),
- Constants.PREF_USER_DER_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.VIRTUAL),
- Constants.PREF_USER_VIR_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP, SchemaType.NORMAL),
- Constants.PREF_MEMBERSHIP_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP,
- SchemaType.DERIVED),
- Constants.PREF_MEMBERSHIP_DER_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP,
- SchemaType.VIRTUAL),
- Constants.PREF_MEMBERSHIP_VIR_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.NORMAL),
- Constants.PREF_ROLE_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.DERIVED),
- Constants.PREF_ROLE_DER_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.VIRTUAL),
- Constants.PREF_ROLE_VIR_SCHEMA_PAGINATOR_ROWS);
- }
- };
+ {
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.NORMAL),
+ Constants.PREF_USER_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.DERIVED),
+ Constants.PREF_USER_DER_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.VIRTUAL),
+ Constants.PREF_USER_VIR_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP, SchemaType.NORMAL),
+ Constants.PREF_MEMBERSHIP_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP,
+ SchemaType.DERIVED),
+ Constants.PREF_MEMBERSHIP_DER_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP,
+ SchemaType.VIRTUAL),
+ Constants.PREF_MEMBERSHIP_VIR_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.NORMAL),
+ Constants.PREF_ROLE_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.DERIVED),
+ Constants.PREF_ROLE_DER_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.VIRTUAL),
+ Constants.PREF_ROLE_VIR_SCHEMA_PAGINATOR_ROWS);
+ }
+ };
private static final int WIN_WIDTH = 600;
@@ -236,7 +237,8 @@ public class Schema extends BasePage {
final AbstractSchemaTO schemaTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(getPage()));
panel.addWithRoles(new ActionLink() {
@@ -253,7 +255,8 @@ public class Schema extends BasePage {
AbstractSchemaModalPage page = SchemaModalPageFactory.getSchemaModalPage(
attributableType, schemaType);
- page.setSchemaModalPage(Schema.this.getPageReference(), modalWindow, schemaTO, false);
+ page.setSchemaModalPage(PageUtils.getPageReference(Schema.this),
+ modalWindow, schemaTO, false);
return page;
}
@@ -329,7 +332,7 @@ public class Schema extends BasePage {
private <T extends AbstractSchemaModalPage> AjaxLink<Void> getCreateSchemaLink(final ModalWindow modalWindow,
final AttributableType attrType, final SchemaType schemaType, final String winLinkName) {
- AjaxLink<Void> link = new ClearIndicatingAjaxLink<Void>(winLinkName, getPageReference()) {
+ AjaxLink<Void> link = new ClearIndicatingAjaxLink<Void>(winLinkName, PageUtils.getPageReference(getPage())) {
private static final long serialVersionUID = -7978723352517770644L;
@@ -342,7 +345,7 @@ public class Schema extends BasePage {
@Override
public Page createPage() {
T page = SchemaModalPageFactory.getSchemaModalPage(attrType, schemaType);
- page.setSchemaModalPage(Schema.this.getPageReference(), modalWindow, null, true);
+ page.setSchemaModalPage(PageUtils.getPageReference(Schema.this), modalWindow, null, true);
return page;
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java Wed Jan 15 09:25:24 2014
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.NotificationTaskTO;
import org.apache.syncope.common.to.PropagationTaskTO;
import org.apache.syncope.common.to.SchedTaskTO;
@@ -117,7 +118,8 @@ public abstract class TaskModalPage exte
final TaskExecTO taskExecutionTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
@@ -164,7 +166,8 @@ public abstract class TaskModalPage exte
@Override
public Component getHeader(final String componentId) {
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(), getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(),
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
@@ -175,7 +178,7 @@ public abstract class TaskModalPage exte
if (target != null) {
final AjaxFallbackDefaultDataTable<TaskExecTO, String> currentTable =
new AjaxFallbackDefaultDataTable<TaskExecTO, String>("executionsTable", columns,
- new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
+ new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
currentTable.setOutputMarkupId(true);
target.add(currentTable);
executions.addOrReplace(currentTable);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java Wed Jan 15 09:25:24 2014
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.TaskExecTO;
import org.apache.syncope.common.to.AbstractTaskTO;
@@ -54,12 +55,12 @@ public class Tasks extends BasePage {
public Tasks() {
super();
- add(new PropagationTasks("propagation", getPageReference()));
- add(new NotificationTasks("notification", getPageReference()));
- add(new SchedTasks("sched", getPageReference()));
- add(new SyncTasks("sync", getPageReference()));
+ add(new PropagationTasks("propagation", PageUtils.getPageReference(getPage())));
+ add(new NotificationTasks("notification", PageUtils.getPageReference(getPage())));
+ add(new SchedTasks("sched", PageUtils.getPageReference(getPage())));
+ add(new SyncTasks("sync", PageUtils.getPageReference(getPage())));
- getPageReference();
+ PageUtils.getPageReference(getPage());
}
@Override
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java Wed Jan 15 09:25:24 2014
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.WorkflowFormTO;
import org.apache.syncope.common.SyncopeClientException;
import org.apache.syncope.console.SyncopeSession;
@@ -114,7 +115,8 @@ public class Todo extends BasePage {
final WorkflowFormTO formTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model,
+ PageUtils.getPageReference(getPage()));
panel.add(new ActionLink() {
@@ -145,7 +147,7 @@ public class Todo extends BasePage {
@Override
public Page createPage() {
- return new ApprovalModalPage(Todo.this.getPageReference(), window, formTO);
+ return new ApprovalModalPage(PageUtils.getPageReference(Todo.this), window, formTO);
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Wed Jan 15 09:25:24 2014
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.AttributesPanel;
@@ -142,7 +143,8 @@ public abstract class UserModalPage exte
//--------------------------------
// Roles panel
//--------------------------------
- form.add(new MembershipsPanel("memberships", userTO, mode == Mode.TEMPLATE, null, getPageReference()));
+ form.add(new MembershipsPanel("memberships", userTO, mode == Mode.TEMPLATE, null,
+ PageUtils.getPageReference(getPage())));
//--------------------------------
final AjaxButton submit = getOnSubmit();
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java Wed Jan 15 09:25:24 2014
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
@@ -61,34 +62,36 @@ public class Users extends BasePage {
editModalWin.setCookieName("edit-modal");
add(editModalWin);
- final AbstractSearchResultPanel searchResult =
- new UserSearchResultPanel("searchResult", true, null, getPageReference(), restClient);
+ final AbstractSearchResultPanel searchResult = new UserSearchResultPanel("searchResult", true, null,
+ PageUtils.getPageReference(getPage()), restClient);
add(searchResult);
final AbstractSearchResultPanel listResult =
- new UserSearchResultPanel("listResult", false, null, getPageReference(), restClient);
+ new UserSearchResultPanel("listResult", false, null, PageUtils.getPageReference(getPage()), restClient);
add(listResult);
// create new user
- final AjaxLink<Void> createLink = new ClearIndicatingAjaxLink<Void>("createLink", getPageReference()) {
+ final AjaxLink<Void> createLink = new ClearIndicatingAjaxLink<Void>("createLink",
+ PageUtils.getPageReference(getPage())) {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- protected void onClickInternal(final AjaxRequestTarget target) {
- editModalWin.setPageCreator(new ModalWindow.PageCreator() {
+ @Override
+ protected void onClickInternal(final AjaxRequestTarget target) {
+ editModalWin.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID = -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- return new EditUserModalPage(Users.this.getPageReference(), editModalWin, new UserTO());
- }
- });
+ @Override
+ public Page createPage() {
+ return new EditUserModalPage(PageUtils.getPageReference(Users.this), editModalWin,
+ new UserTO());
+ }
+ });
- editModalWin.show(target);
- }
- };
+ editModalWin.show(target);
+ }
+ };
MetaDataRoleAuthorizationStrategy.authorize(
createLink, ENABLE, xmlRolesReader.getAllAllowedRoles("Users", "create"));
add(createLink);
@@ -102,7 +105,8 @@ public class Users extends BasePage {
searchForm.add(searchPanel);
final ClearIndicatingAjaxButton searchButton =
- new ClearIndicatingAjaxButton("search", new ResourceModel("search"), getPageReference()) {
+ new ClearIndicatingAjaxButton("search", new ResourceModel("search"),
+ PageUtils.getPageReference(getPage())) {
private static final long serialVersionUID = -958724007591692537L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java Wed Jan 15 09:25:24 2014
@@ -23,6 +23,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.SyncopeClientException;
import org.apache.syncope.console.commons.Constants;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.console.rest.WorkflowRestClient;
import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -54,8 +55,8 @@ public class XMLEditorPopupPage extends
final TextArea<String> workflowDefArea = new TextArea<String>("workflowDefArea", new Model<String>(definition));
wfForm.add(workflowDefArea);
- AjaxButton submit =
- new ClearIndicatingAjaxButton(APPLY, new Model<String>(getString(SUBMIT)), getPageReference()) {
+ AjaxButton submit = new ClearIndicatingAjaxButton(APPLY, new Model<String>(getString(SUBMIT)),
+ PageUtils.getPageReference(this)) {
private static final long serialVersionUID = -958724007591692537L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java Wed Jan 15 09:25:24 2014
@@ -20,6 +20,7 @@ package org.apache.syncope.console.pages
import java.util.Collection;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.console.commons.AttributableDataProvider;
import org.apache.syncope.console.commons.Constants;
@@ -264,7 +265,7 @@ public abstract class AbstractSearchResu
restClient,
"id",
getPageId(),
- page.getPageReference());
+ PageUtils.getPageReference(page));
resultTable.setCurrentPage(currentPage);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java Wed Jan 15 09:25:24 2014
@@ -26,6 +26,7 @@ import javax.swing.tree.DefaultMutableTr
import org.apache.syncope.common.to.MembershipTO;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.to.UserTO;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.console.commons.RoleTreeBuilder;
import org.apache.syncope.console.commons.RoleUtils;
import org.apache.syncope.console.commons.status.StatusUtils;
@@ -122,7 +123,7 @@ public class MembershipsPanel extends Pa
@Override
public Page createPage() {
- PageReference pageRef = getPage().getPageReference();
+ PageReference pageRef = PageUtils.getPageReference(getPage());
for (MembershipTO membTO : membView.getList()) {
if (membTO.getRoleId() == roleTO.getId()) {
@@ -151,68 +152,68 @@ public class MembershipsPanel extends Pa
membView = new ListView<MembershipTO>("memberships",
new PropertyModel<List<? extends MembershipTO>>(userTO, "memberships")) {
- private static final long serialVersionUID = 9101744072914090143L;
+ private static final long serialVersionUID = 9101744072914090143L;
- @Override
- protected void populateItem(final ListItem<MembershipTO> item) {
- final MembershipTO membershipTO = (MembershipTO) item.getDefaultModelObject();
+ @Override
+ protected void populateItem(final ListItem<MembershipTO> item) {
+ final MembershipTO membershipTO = (MembershipTO) item.getDefaultModelObject();
- item.add(new Label("roleId", new Model<Long>(membershipTO.getRoleId())));
- item.add(new Label("roleName", new Model<String>(membershipTO.getRoleName())));
+ item.add(new Label("roleId", new Model<Long>(membershipTO.getRoleId())));
+ item.add(new Label("roleName", new Model<String>(membershipTO.getRoleName())));
- AjaxLink editLink = new ClearIndicatingAjaxLink("editLink", pageRef) {
+ AjaxLink editLink = new ClearIndicatingAjaxLink("editLink", pageRef) {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- protected void onClickInternal(final AjaxRequestTarget target) {
- membWin.setPageCreator(new ModalWindow.PageCreator() {
+ @Override
+ protected void onClickInternal(final AjaxRequestTarget target) {
+ membWin.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID = -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- return new MembershipModalPage(getPage().getPageReference(), membWin,
- membershipTO, templateMode);
+ @Override
+ public Page createPage() {
+ return new MembershipModalPage(PageUtils.getPageReference(getPage()), membWin,
+ membershipTO, templateMode);
+ }
+ });
+ membWin.show(target);
}
- });
- membWin.show(target);
- }
- };
- item.add(editLink);
+ };
+ item.add(editLink);
- AjaxLink deleteLink = new IndicatingOnConfirmAjaxLink("deleteLink", pageRef) {
+ AjaxLink deleteLink = new IndicatingOnConfirmAjaxLink("deleteLink", pageRef) {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- protected void onClickInternal(final AjaxRequestTarget target) {
- userTO.getMemberships().remove(membershipTO);
- target.add(membershipsContainer);
+ @Override
+ protected void onClickInternal(final AjaxRequestTarget target) {
+ userTO.getMemberships().remove(membershipTO);
+ target.add(membershipsContainer);
- RoleTO roleTO = RoleUtils.findRole(roleTreeBuilder, membershipTO.getRoleId());
- Set<String> resourcesToRemove = roleTO == null
+ RoleTO roleTO = RoleUtils.findRole(roleTreeBuilder, membershipTO.getRoleId());
+ Set<String> resourcesToRemove = roleTO == null
? Collections.<String>emptySet() : roleTO.getResources();
- if (!resourcesToRemove.isEmpty()) {
- Set<String> resourcesAssignedViaMembership = new HashSet<String>();
- for (MembershipTO membTO : userTO.getMemberships()) {
- roleTO = RoleUtils.findRole(roleTreeBuilder, membTO.getRoleId());
- if (roleTO != null) {
- resourcesAssignedViaMembership.addAll(roleTO.getResources());
+ if (!resourcesToRemove.isEmpty()) {
+ Set<String> resourcesAssignedViaMembership = new HashSet<String>();
+ for (MembershipTO membTO : userTO.getMemberships()) {
+ roleTO = RoleUtils.findRole(roleTreeBuilder, membTO.getRoleId());
+ if (roleTO != null) {
+ resourcesAssignedViaMembership.addAll(roleTO.getResources());
+ }
+ }
+ resourcesToRemove.removeAll(resourcesAssignedViaMembership);
+ resourcesToRemove.removeAll(userTO.getResources());
}
- }
- resourcesToRemove.removeAll(resourcesAssignedViaMembership);
- resourcesToRemove.removeAll(userTO.getResources());
- }
- StatusUtils.update(
- userTO, statusPanel, target, Collections.<String>emptySet(), resourcesToRemove);
+ StatusUtils.update(
+ userTO, statusPanel, target, Collections.<String>emptySet(), resourcesToRemove);
+ }
+ };
+ item.add(deleteLink);
}
};
- item.add(deleteLink);
- }
- };
membershipsContainer.add(membView);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java Wed Jan 15 09:25:24 2014
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages.panels;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
@@ -107,7 +108,7 @@ public class RoleDetailsPanel extends Pa
@Override
public Page createPage() {
- return new RoleSelectModalPage(getPage().getPageReference(), parentSelectWin,
+ return new RoleSelectModalPage(PageUtils.getPageReference(getPage()), parentSelectWin,
ParentSelectPayload.class);
}
});
@@ -165,7 +166,7 @@ public class RoleDetailsPanel extends Pa
@Override
public Page createPage() {
- return new UserOwnerSelectModalPage(getPage().getPageReference(), userOwnerSelectWin);
+ return new UserOwnerSelectModalPage(PageUtils.getPageReference(getPage()), userOwnerSelectWin);
}
});
userOwnerSelectWin.show(target);
@@ -202,7 +203,7 @@ public class RoleDetailsPanel extends Pa
@Override
public Page createPage() {
- return new RoleSelectModalPage(getPage().getPageReference(), parentSelectWin,
+ return new RoleSelectModalPage(PageUtils.getPageReference(getPage()), parentSelectWin,
RoleOwnerSelectPayload.class);
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java Wed Jan 15 09:25:24 2014
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.SyncopeClientException;
@@ -82,7 +83,8 @@ public class RoleSearchResultPanel exten
public void populateItem(final Item<ICellPopulator<AbstractAttributableTO>> cellItem,
final String componentId, final IModel<AbstractAttributableTO> model) {
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, page.getPageReference());
+ final ActionLinksPanel panel =
+ new ActionLinksPanel(componentId, model, PageUtils.getPageReference(page));
panel.add(new ActionLink() {
@@ -97,7 +99,7 @@ public class RoleSearchResultPanel exten
@Override
public Page createPage() {
return new StatusModalPage<RoleTO>(
- page.getPageReference(), statusmodal, (RoleTO) model.getObject());
+ PageUtils.getPageReference(page), statusmodal, (RoleTO) model.getObject());
}
});
@@ -118,7 +120,7 @@ public class RoleSearchResultPanel exten
@Override
public Page createPage() {
return new RoleModalPage(
- page.getPageReference(), editmodal, (RoleTO) model.getObject());
+ PageUtils.getPageReference(page), editmodal, (RoleTO) model.getObject());
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java?rev=1558323&r1=1558322&r2=1558323&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java Wed Jan 15 09:25:24 2014
@@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.List;
+import org.apache.syncope.console.commons.PageUtils;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
@@ -137,7 +138,8 @@ public class UserSearchResultPanel exten
@Override
public ActionLinksPanel getActions(final String componentId, final IModel<AbstractAttributableTO> model) {
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, page.getPageReference());
+ final ActionLinksPanel panel =
+ new ActionLinksPanel(componentId, model, PageUtils.getPageReference(page));
panel.add(new ActionLink() {
@@ -152,7 +154,7 @@ public class UserSearchResultPanel exten
@Override
public Page createPage() {
return new StatusModalPage<UserTO>(
- page.getPageReference(), statusmodal, (UserTO) model.getObject());
+ PageUtils.getPageReference(page), statusmodal, (UserTO) model.getObject());
}
});
@@ -172,8 +174,8 @@ public class UserSearchResultPanel exten
@Override
public Page createPage() {
- return new StatusModalPage<UserTO>(
- page.getPageReference(), statusmodal, (UserTO) model.getObject(), true);
+ return new StatusModalPage<UserTO>(PageUtils.getPageReference(page), statusmodal,
+ (UserTO) model.getObject(), true);
}
});
@@ -195,7 +197,7 @@ public class UserSearchResultPanel exten
public Page createPage() {
// SYNCOPE-294: re-read userTO before edit
UserTO userTO = ((UserRestClient) restClient).read(model.getObject().getId());
- return new EditUserModalPage(page.getPageReference(), editmodal, userTO);
+ return new EditUserModalPage(PageUtils.getPageReference(page), editmodal, userTO);
}
});
@@ -237,7 +239,8 @@ public class UserSearchResultPanel exten
@Override
public ActionLinksPanel getHeader(final String componentId) {
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(), page.getPageReference());
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(),
+ PageUtils.getPageReference(page));
panel.add(new ActionLink() {
@@ -251,7 +254,7 @@ public class UserSearchResultPanel exten
@Override
public Page createPage() {
- return new DisplayAttributesModalPage(page.getPageReference(), displaymodal,
+ return new DisplayAttributesModalPage(PageUtils.getPageReference(page), displaymodal,
schemaNames, dSchemaNames, vSchemaNames);
}
});