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 2013/02/18 10:19:27 UTC
svn commit: r1447162 [2/3] - in /syncope/trunk: ./
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/console/pages/panels/
console/src/main/java/org/apache/syncope/console/rest/
console/src/main/java/org/a...
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java Mon Feb 18 09:19:25 2013
@@ -25,10 +25,10 @@ import org.apache.syncope.common.to.User
import org.apache.syncope.console.commons.StatusBean;
import org.apache.syncope.console.pages.panels.StatusPanel;
import org.apache.syncope.console.rest.UserRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.ResourceModel;
@@ -41,7 +41,7 @@ public class StatusModalPage extends Bas
@SpringBean
private UserRestClient userRestClient;
- public StatusModalPage(final PageReference callerPageRef, final ModalWindow window,
+ public StatusModalPage(final PageReference pageRef, final ModalWindow window,
final AbstractAttributableTO attributable) {
super();
@@ -56,18 +56,17 @@ public class StatusModalPage extends Bas
final AjaxButton disable;
if (attributable instanceof UserTO) {
- disable = new IndicatingAjaxButton("disable", new ResourceModel("disable", "Disable")) {
+ disable = new ClearIndicatingAjaxButton("disable", new ResourceModel("disable", "Disable"), pageRef) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form form) {
-
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form form) {
try {
userRestClient.suspend(attributable.getId(), statuses);
- if (callerPageRef.getPage() instanceof BasePage) {
- ((BasePage) callerPageRef.getPage()).setModalResult(true);
+ if (pageRef.getPage() instanceof BasePage) {
+ ((BasePage) pageRef.getPage()).setModalResult(true);
}
window.close(target);
@@ -95,17 +94,16 @@ public class StatusModalPage extends Bas
final AjaxButton enable;
if (attributable instanceof UserTO) {
- enable = new IndicatingAjaxButton("enable", new ResourceModel("enable", "Enable")) {
+ enable = new ClearIndicatingAjaxButton("enable", new ResourceModel("enable", "Enable"), pageRef) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
try {
userRestClient.reactivate(attributable.getId(), statuses);
- ((BasePage) callerPageRef.getPage()).setModalResult(true);
+ ((BasePage) pageRef.getPage()).setModalResult(true);
window.close(target);
} catch (Exception e) {
@@ -131,18 +129,14 @@ public class StatusModalPage extends Bas
}
form.add(enable);
- final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+ final AjaxButton cancel = new ClearIndicatingAjaxButton("cancel", new ResourceModel("cancel"), pageRef) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form form) {
window.close(target);
}
-
- @Override
- protected void onError(final AjaxRequestTarget target, final Form form) {
- }
};
cancel.setDefaultFormProcessing(false);
form.add(cancel);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java Mon Feb 18 09:19:25 2013
@@ -43,9 +43,9 @@ public class SyncTaskModalPage extends A
@SpringBean
private ResourceRestClient resourceRestClient;
- public SyncTaskModalPage(final ModalWindow window, final SyncTaskTO taskTO, final PageReference callerPageRef) {
+ public SyncTaskModalPage(final ModalWindow window, final SyncTaskTO taskTO, final PageReference pageRef) {
- super(window, taskTO, callerPageRef);
+ super(window, taskTO, pageRef);
final IModel<List<String>> allResources = new LoadableDetachableModel<List<String>>() {
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -31,16 +31,17 @@ import org.apache.syncope.common.to.Task
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -71,15 +72,14 @@ public abstract class TaskModalPage exte
@SpringBean
protected TaskRestClient taskRestClient;
-
+
protected WebMarkupContainer profile;
protected WebMarkupContainer executions;
protected Form form;
-
- public TaskModalPage(final TaskTO taskTO) {
+ public TaskModalPage(final TaskTO taskTO, final PageReference pageRef) {
final ModalWindow taskExecMessageWin = new ModalWindow("taskExecMessageWin");
taskExecMessageWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
taskExecMessageWin.setCookieName("task-exec-message-win-modal");
@@ -105,7 +105,7 @@ public abstract class TaskModalPage exte
id.setEnabled(false);
profile.add(id);
-
+
final List<IColumn> columns = new ArrayList<IColumn>();
columns.add(new PropertyColumn(new ResourceModel("id"), "id", "id"));
@@ -130,7 +130,7 @@ public abstract class TaskModalPage exte
final TaskExecTO taskExecutionTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
panel.add(new ActionLink() {
@@ -182,23 +182,25 @@ public abstract class TaskModalPage exte
executions.add(table);
- final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ final AjaxLink reload = new ClearIndicatingAjaxLink("reload", pageRef) {
+
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
if (target != null) {
- final AjaxFallbackDefaultDataTable currentTable =
+ final AjaxFallbackDefaultDataTable currentTable =
new AjaxFallbackDefaultDataTable("executionsTable", columns,
new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
currentTable.setOutputMarkupId(true);
target.add(currentTable);
- executions.addOrReplace(currentTable);
+ executions.addOrReplace(currentTable);
}
}
};
-
+
reload.add(new Behavior() {
+
private static final long serialVersionUID = 1469628524240283489L;
@Override
@@ -239,7 +241,7 @@ public abstract class TaskModalPage exte
Collections.sort(list, comparator);
- return list.subList((int)first, (int)first + (int)count).iterator();
+ return list.subList((int) first, (int) first + (int) count).iterator();
}
@Override
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -50,8 +50,8 @@ public class Tasks extends BasePage {
public Tasks(final PageParameters parameters) {
super();
- add(new PropagationTasks("propagation"));
- add(new NotificationTasks("notification"));
+ add(new PropagationTasks("propagation", getPageReference()));
+ add(new NotificationTasks("notification", getPageReference()));
add(new SchedTasks("sched", getPageReference()));
add(new SyncTasks("sync", getPageReference()));
}
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -136,7 +136,7 @@ public class Todo extends BasePage {
final WorkflowFormTO formTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
panel.add(new ActionLink() {
@@ -248,7 +248,7 @@ public class Todo extends BasePage {
final UserRequestTO request = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
panel.add(new ActionLink() {
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -25,11 +25,11 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.panels.ResourcesPanel;
import org.apache.syncope.console.pages.panels.UserDetailsPanel;
import org.apache.syncope.console.pages.panels.VirtualAttributesPanel;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -53,7 +53,7 @@ public abstract class UserModalPage exte
private static final long serialVersionUID = 5002005009737457667L;
- protected final PageReference callerPageRef;
+ protected final PageReference pageRef;
protected final ModalWindow window;
@@ -70,7 +70,7 @@ public abstract class UserModalPage exte
super();
- this.callerPageRef = callerPageRef;
+ this.pageRef = callerPageRef;
this.window = window;
this.userTO = userTO;
this.mode = mode;
@@ -122,13 +122,13 @@ public abstract class UserModalPage exte
//--------------------------------
// Derived attributes panel
//--------------------------------
- form.add(new DerivedAttributesPanel("derivedAttributes", userTO));
+ form.add(new DerivedAttributesPanel("derivedAttributes", userTO, pageRef));
//--------------------------------
//--------------------------------
// Virtual attributes panel
//--------------------------------
- form.add(new VirtualAttributesPanel("virtualAttributes", userTO, mode == Mode.TEMPLATE));
+ form.add(new VirtualAttributesPanel("virtualAttributes", userTO, mode == Mode.TEMPLATE, pageRef));
//--------------------------------
//--------------------------------
@@ -140,7 +140,7 @@ public abstract class UserModalPage exte
//--------------------------------
// Roles panel
//--------------------------------
- form.add(new MembershipsPanel("memberships", userTO, mode == Mode.TEMPLATE, null));
+ form.add(new MembershipsPanel("memberships", userTO, mode == Mode.TEMPLATE, null, pageRef));
//--------------------------------
final AjaxButton submit = getOnSubmit();
@@ -176,17 +176,17 @@ public abstract class UserModalPage exte
}
protected AjaxButton getOnSubmit() {
- return new IndicatingAjaxButton("apply", new ResourceModel("submit")) {
+ return new ClearIndicatingAjaxButton("apply", new ResourceModel("submit"), pageRef) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
try {
submitAction(target, form);
- if (callerPageRef.getPage() instanceof BasePage) {
- ((BasePage) callerPageRef.getPage()).setModalResult(true);
+ if (pageRef.getPage() instanceof BasePage) {
+ ((BasePage) pageRef.getPage()).setModalResult(true);
}
closeAction(target, form);
@@ -199,7 +199,6 @@ public abstract class UserModalPage exte
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
-
target.add(feedbackPanel);
}
};
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -25,14 +25,14 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.panels.UserSearchPanel;
import org.apache.syncope.console.pages.panels.UserSearchResultPanel;
import org.apache.syncope.console.rest.UserRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.ResourceModel;
@@ -70,12 +70,12 @@ public class Users extends BasePage {
add(listResult);
// create new user
- final AjaxLink createLink = new IndicatingAjaxLink("createLink") {
+ final AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", getPageReference()) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
editModalWin.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@@ -101,13 +101,12 @@ public class Users extends BasePage {
final UserSearchPanel searchPanel = new UserSearchPanel("searchPanel");
searchForm.add(searchPanel);
- searchForm.add(new IndicatingAjaxButton("search", new ResourceModel("search")) {
+ searchForm.add(new ClearIndicatingAjaxButton("search", new ResourceModel("search"), getPageReference()) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
final NodeCond searchCond = searchPanel.buildSearchCond();
LOG.debug("Node condition " + searchCond);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java Mon Feb 18 09:19:25 2013
@@ -22,12 +22,13 @@ import org.apache.syncope.common.Abstrac
import org.apache.syncope.common.to.VirtualSchemaTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.CompoundPropertyModel;
@@ -46,7 +47,7 @@ public class VirtualSchemaModalPage exte
}
@Override
- public void setSchemaModalPage(final PageReference callerPageRef, final ModalWindow window,
+ public void setSchemaModalPage(final PageReference pageRef, final ModalWindow window,
AbstractBaseBean schema, final boolean createFlag) {
if (schema == null) {
@@ -62,27 +63,25 @@ public class VirtualSchemaModalPage exte
name.addRequiredLabel();
name.setEnabled(createFlag);
-
+
final AjaxCheckBoxPanel readonly = new AjaxCheckBoxPanel("readonly", getString("readonly"),
- new PropertyModel<Boolean>(schema, "readonly"));
+ new PropertyModel<Boolean>(schema, "readonly"));
- final IndicatingAjaxButton submit = new IndicatingAjaxButton("apply", new ResourceModel("submit")) {
+ final AjaxButton submit = new ClearIndicatingAjaxButton("apply", new ResourceModel("submit"), pageRef) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form form) {
VirtualSchemaTO schemaTO = (VirtualSchemaTO) form.getDefaultModelObject();
-
try {
if (createFlag) {
restClient.createVirtualSchema(kind, schemaTO);
} else {
restClient.updateVirtualSchema(kind, schemaTO);
}
- if (callerPageRef.getPage() instanceof BasePage) {
- ((BasePage) callerPageRef.getPage()).setModalResult(true);
+ if (pageRef.getPage() instanceof BasePage) {
+ ((BasePage) pageRef.getPage()).setModalResult(true);
}
window.close(target);
@@ -94,24 +93,20 @@ public class VirtualSchemaModalPage exte
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
-
target.add(feedbackPanel);
}
};
-
- final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel", new ResourceModel("cancel")) {
+
+ final AjaxButton cancel = new ClearIndicatingAjaxButton("cancel", new ResourceModel("cancel"), pageRef) {
+
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
window.close(target);
}
-
- @Override
- protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- }
};
-
+
cancel.setDefaultFormProcessing(false);
String allowedRoles;
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -29,6 +29,7 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.DisplayAttributesModalPage;
import org.apache.syncope.console.rest.AbstractAttributableRestClient;
import org.apache.syncope.console.rest.UserRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
@@ -40,7 +41,6 @@ import org.apache.wicket.behavior.Behavi
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.event.IEventSource;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -165,13 +165,13 @@ public abstract class AbstractSearchResu
protected final AbstractBasePage page;
protected <T extends AbstractAttributableTO> AbstractSearchResultPanel(final String id, final boolean filtered,
- final NodeCond searchCond, final PageReference callerRef, final AbstractAttributableRestClient restClient) {
+ final NodeCond searchCond, final PageReference pageRef, final AbstractAttributableRestClient restClient) {
super(id);
setOutputMarkupId(true);
- this.page = (AbstractBasePage) callerRef.getPage();
+ this.page = (AbstractBasePage) pageRef.getPage();
this.filtered = filtered;
this.filter = searchCond;
@@ -215,13 +215,12 @@ public abstract class AbstractSearchResu
// ---------------------------
// Link to select schemas/columns to be shown (User)
// ---------------------------
- displayAttrsLink = new IndicatingAjaxLink("displayAttrsLink") {
+ displayAttrsLink = new ClearIndicatingAjaxLink("displayAttrsLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
displaymodal.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@@ -258,6 +257,7 @@ public abstract class AbstractSearchResu
displayAttrsLink, ENABLE, xmlRolesReader.getAllAllowedRoles("Users", "changeView"));
} else {
displayAttrsLink = new AjaxLink("displayAttrsLink") {
+
private static final long serialVersionUID = -7978723352517770644L;
@Override
@@ -268,12 +268,12 @@ public abstract class AbstractSearchResu
}
container.add(displayAttrsLink);
- final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ final AjaxLink reload = new ClearIndicatingAjaxLink("reload", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
if (target != null) {
target.add(resultTable);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java Mon Feb 18 09:19:25 2013
@@ -25,15 +25,16 @@ import org.apache.syncope.common.to.Role
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.console.rest.SchemaRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox;
import org.apache.wicket.Component;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -62,7 +63,9 @@ public class DerivedAttributesPanel exte
@SpringBean
private SchemaRestClient schemaRestClient;
- public <T extends AbstractAttributableTO> DerivedAttributesPanel(final String id, final T entityTO) {
+ public <T extends AbstractAttributableTO> DerivedAttributesPanel(final String id, final T entityTO,
+ final PageReference pageRef) {
+
super(id);
setOutputMarkupId(true);
@@ -87,20 +90,19 @@ public class DerivedAttributesPanel exte
attributesContainer.setOutputMarkupId(true);
add(attributesContainer);
- AjaxButton addAttributeBtn = new IndicatingAjaxButton("addAttributeBtn", new ResourceModel("addAttributeBtn")) {
+ AjaxButton addAttributeBtn = new ClearIndicatingAjaxButton("addAttributeBtn",
+ new ResourceModel("addAttributeBtn"), pageRef) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
entityTO.getDerivedAttributes().add(new AttributeTO());
target.add(attributesContainer);
}
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
-
target.add(attributesContainer);
}
};
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -31,6 +31,7 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.commons.StatusUtils;
import org.apache.syncope.console.pages.MembershipModalPage;
import org.apache.syncope.console.pages.UserModalPage;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
import org.apache.syncope.console.wicket.markup.html.tree.DefaultMutableTreeNodeExpansion;
import org.apache.syncope.console.wicket.markup.html.tree.DefaultMutableTreeNodeExpansionModel;
@@ -40,7 +41,6 @@ import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.markup.html.repeater.tree.DefaultNestedTree;
import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
@@ -73,7 +73,7 @@ public class MembershipsPanel extends Pa
private final NestedTree<DefaultMutableTreeNode> tree;
public MembershipsPanel(final String id, final UserTO userTO, final boolean templateMode,
- final StatusPanel statusPanel) {
+ final StatusPanel statusPanel, final PageReference pageRef) {
super(id);
this.userTO = userTO;
@@ -160,12 +160,12 @@ public class MembershipsPanel extends Pa
item.add(new Label("roleId", new Model<Long>(membershipTO.getRoleId())));
item.add(new Label("roleName", new Model<String>(membershipTO.getRoleName())));
- AjaxLink editLink = new IndicatingAjaxLink("editLink") {
+ AjaxLink editLink = new ClearIndicatingAjaxLink("editLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
membWin.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@@ -182,12 +182,12 @@ public class MembershipsPanel extends Pa
};
item.add(editLink);
- AjaxLink deleteLink = new IndicatingDeleteOnConfirmAjaxLink("deleteLink") {
+ AjaxLink deleteLink = new IndicatingDeleteOnConfirmAjaxLink("deleteLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
userTO.removeMembership(membershipTO);
target.add(membershipsContainer);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java Mon Feb 18 09:19:25 2013
@@ -30,15 +30,16 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.Tasks;
import org.apache.syncope.console.pages.Tasks.TasksProvider;
import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -86,7 +87,7 @@ public class NotificationTasks extends P
private AjaxFallbackDefaultDataTable<TaskTO, String> table;
- public NotificationTasks(String id) {
+ public NotificationTasks(final String id, final PageReference pageRef) {
super(id);
container = new WebMarkupContainer("container");
@@ -122,7 +123,7 @@ public class NotificationTasks extends P
final TaskTO taskTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
panel.add(new ActionLink() {
@@ -137,7 +138,7 @@ public class NotificationTasks extends P
@Override
public Page createPage() {
- return new NotificationTaskModalPage(taskTO);
+ return new NotificationTaskModalPage(taskTO, pageRef);
}
});
@@ -192,11 +193,12 @@ public class NotificationTasks extends P
container.add(table);
- final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ final AjaxLink reload = new ClearIndicatingAjaxLink("reload", pageRef) {
+
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(AjaxRequestTarget target) {
+ public void onClickInternal(final AjaxRequestTarget target) {
if (target != null) {
target.add(table);
}
@@ -204,7 +206,7 @@ public class NotificationTasks extends P
};
reload.add(new Behavior() {
-
+
private static final long serialVersionUID = 1469628524240283489L;
@Override
@@ -222,6 +224,7 @@ public class NotificationTasks extends P
container.add(reload);
window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
+
private static final long serialVersionUID = 8804221891699487139L;
@Override
@@ -256,10 +259,10 @@ public class NotificationTasks extends P
table = Tasks.updateTaskTable(
columns,
- new TasksProvider<NotificationTaskTO>(restClient, paginatorRows,
- getId(), NotificationTaskTO.class),
+ new TasksProvider<NotificationTaskTO>(restClient, paginatorRows, getId(),
+ NotificationTaskTO.class),
container,
- table == null ? 0 : (int)table.getCurrentPage());
+ table == null ? 0 : (int) table.getCurrentPage());
target.add(container);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java Mon Feb 18 09:19:25 2013
@@ -34,13 +34,15 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.commons.XMLRolesReader;
import org.apache.syncope.console.pages.PolicyModalPage;
import org.apache.syncope.console.rest.PolicyRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
import org.apache.wicket.Page;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -92,7 +94,7 @@ public class PoliciesPanel extends Panel
private PolicyType policyType;
- public PoliciesPanel(final String id, final PolicyType policyType) {
+ public PoliciesPanel(final String id, final PageReference pageRef, final PolicyType policyType) {
super(id);
this.policyType = policyType;
@@ -146,7 +148,7 @@ public class PoliciesPanel extends Panel
final PolicyTO accountPolicyTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
panel.add(new ActionLink() {
@@ -161,8 +163,7 @@ public class PoliciesPanel extends Panel
@Override
public Page createPage() {
- final PolicyModalPage page = new PolicyModalPage(mwindow, accountPolicyTO);
- return page;
+ return new PolicyModalPage(mwindow, accountPolicyTO, pageRef);
}
});
@@ -184,8 +185,8 @@ public class PoliciesPanel extends Panel
} catch (SyncopeClientCompositeErrorException e) {
error(getString("operation_error"));
- LOG.error("While deleting resource {}({})", accountPolicyTO.getId(),
- accountPolicyTO.getDescription(), e);
+ LOG.error("While deleting resource {}({})", new Object[]{accountPolicyTO.getId(),
+ accountPolicyTO.getDescription()}, e);
}
target.add(container);
@@ -202,21 +203,19 @@ public class PoliciesPanel extends Panel
container.add(table);
- final IndicatingAjaxLink createButton = new IndicatingAjaxLink("createLink") {
+ final AjaxLink createButton = new ClearIndicatingAjaxLink("createLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
mwindow.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@Override
public Page createPage() {
- final PolicyModalPage page = new PolicyModalPage(mwindow, getPolicyTOInstance(policyType));
- return page;
+ return new PolicyModalPage(mwindow, getPolicyTOInstance(policyType), pageRef);
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java Mon Feb 18 09:19:25 2013
@@ -30,16 +30,17 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.Tasks;
import org.apache.syncope.console.pages.Tasks.TasksProvider;
import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -90,7 +91,7 @@ public class PropagationTasks extends Pa
private AjaxFallbackDefaultDataTable<TaskTO, String> table;
- public PropagationTasks(final String id) {
+ public PropagationTasks(final String id, final PageReference pageRef) {
super(id);
container = new WebMarkupContainer("container");
@@ -137,7 +138,7 @@ public class PropagationTasks extends Pa
final TaskTO taskTO = model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
panel.add(new ActionLink() {
@@ -152,7 +153,7 @@ public class PropagationTasks extends Pa
@Override
public Page createPage() {
- return new PropagationTaskModalPage(taskTO);
+ return new PropagationTaskModalPage(taskTO, pageRef);
}
});
@@ -225,12 +226,12 @@ public class PropagationTasks extends Pa
window.setInitialWidth(WIN_WIDTH);
window.setCookieName("view-task-win");
- final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ final AjaxLink reload = new ClearIndicatingAjaxLink("reload", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(AjaxRequestTarget target) {
+ protected void onClickInternal(AjaxRequestTarget target) {
if (target != null) {
target.add(table);
}
@@ -275,7 +276,7 @@ public class PropagationTasks extends Pa
new TasksProvider<PropagationTaskTO>(restClient, paginatorRows,
getId(), PropagationTaskTO.class),
container,
- table == null ? 0 : (int)table.getCurrentPage());
+ table == null ? 0 : (int) table.getCurrentPage());
target.add(container);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java Mon Feb 18 09:19:25 2013
@@ -29,6 +29,7 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.ResourceModalPage.ResourceEvent;
import org.apache.syncope.console.pages.panels.ResourceDetailsPanel.DetailsModEvent;
import org.apache.syncope.console.rest.ConnectorRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
@@ -36,12 +37,12 @@ import org.apache.syncope.console.wicket
import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel.MultiValueSelectorEvent;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -93,7 +94,8 @@ public class ResourceConnConfPanel exten
private ResourceTO resourceTO;
- public ResourceConnConfPanel(final String id, final ResourceTO resourceTO, final boolean createFlag) {
+ public ResourceConnConfPanel(final String id, final ResourceTO resourceTO, final boolean createFlag,
+ final PageReference pageRef) {
super(id);
setOutputMarkupId(true);
@@ -107,13 +109,12 @@ public class ResourceConnConfPanel exten
connConfPropContainer.setOutputMarkupId(true);
add(connConfPropContainer);
- check = new IndicatingAjaxLink("check", new ResourceModel("check")) {
+ check = new ClearIndicatingAjaxLink("check", new ResourceModel("check"), pageRef) {
private static final long serialVersionUID = -4199438518229098169L;
@Override
- public void onClick(final AjaxRequestTarget target) {
-
+ protected void onClickInternal(final AjaxRequestTarget target) {
if (connRestClient.check(resourceTO)) {
info(getString("success_connection"));
} else {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Mon Feb 18 09:19:25 2013
@@ -35,12 +35,14 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.pages.panels.ResourceConnConfPanel.ConnConfModEvent;
import org.apache.syncope.console.rest.ConnectorRestClient;
import org.apache.syncope.console.rest.SchemaRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
import org.apache.wicket.Component;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -48,7 +50,6 @@ import org.apache.wicket.ajax.form.AjaxF
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.event.IEvent;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -164,7 +165,8 @@ public class ResourceMappingPanel extend
* @param resourceTO external resource
* @param attrType USER / ROLE
*/
- public ResourceMappingPanel(final String panelid, final ResourceTO resourceTO, final AttributableType attrType) {
+ public ResourceMappingPanel(final String panelid, final ResourceTO resourceTO, final AttributableType attrType,
+ final PageReference pageRef) {
super(panelid);
setOutputMarkupId(true);
@@ -369,7 +371,7 @@ public class ResourceMappingPanel extend
extAttrName.setModelObject(null);
extAttrName.setRequired(!accountId.getModelObject());
target.add(extAttrName);
-
+
if (accountId.getModelObject()) {
mapItem.setMandatoryCondition("true");
mandatory.setEnabled(false);
@@ -426,20 +428,15 @@ public class ResourceMappingPanel extend
mappings.setReuseItems(true);
mappingContainer.add(mappings);
- addMappingBtn = new IndicatingAjaxButton("addMappingBtn", new ResourceModel("add")) {
+ addMappingBtn = new ClearIndicatingAjaxButton("addMappingBtn", new ResourceModel("add"), pageRef) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
getMapping().getItems().add(new MappingItemTO());
target.add(ResourceMappingPanel.this);
}
-
- @Override
- protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- // ignore errors
- }
};
addMappingBtn.setDefaultFormProcessing(false);
addMappingBtn.setEnabled(this.resourceTO.getConnectorId() != null && this.resourceTO.getConnectorId() > 0);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java Mon Feb 18 09:19:25 2013
@@ -23,6 +23,7 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.pages.RoleModalPage;
import org.apache.syncope.console.rest.AuthRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import org.apache.wicket.PageReference;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
@@ -39,7 +40,9 @@ public class RolePanel extends Panel {
private final Palette<String> entitlementsPalette;
- public RolePanel(final String id, final Form form, final RoleTO roleTO, final RoleModalPage.Mode mode) {
+ public RolePanel(final String id, final Form form, final RoleTO roleTO, final RoleModalPage.Mode mode,
+ final PageReference pageRef) {
+
super(id);
this.add(new RoleDetailsPanel("details", roleTO, form, mode == RoleModalPage.Mode.TEMPLATE));
@@ -57,7 +60,7 @@ public class RolePanel extends Panel {
//--------------------------------
// Derived attributes container
//--------------------------------
- this.add(new DerivedAttributesPanel("derivedAttributes", roleTO));
+ this.add(new DerivedAttributesPanel("derivedAttributes", roleTO, pageRef));
final AjaxCheckBoxPanel inhDerivedAttributes = new AjaxCheckBoxPanel("inheritDerivedAttributes",
"inheritDerivedAttributes", new PropertyModel<Boolean>(roleTO, "inheritDerivedAttributes"));
@@ -69,7 +72,7 @@ public class RolePanel extends Panel {
//--------------------------------
// Virtual attributes container
//--------------------------------
- this.add(new VirtualAttributesPanel("virtualAttributes", roleTO, mode == RoleModalPage.Mode.TEMPLATE));
+ this.add(new VirtualAttributesPanel("virtualAttributes", roleTO, mode == RoleModalPage.Mode.TEMPLATE, pageRef));
final AjaxCheckBoxPanel inhVirtualAttributes = new AjaxCheckBoxPanel("inheritVirtualAttributes",
"inheritVirtualAttributes", new PropertyModel<Boolean>(roleTO, "inheritVirtualAttributes"));
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -43,103 +43,104 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.ResourceModel;
public class RoleSearchResultPanel extends AbstractSearchResultPanel {
-
+
private static final long serialVersionUID = -1180593361914008764L;
-
+
public <T extends AbstractAttributableTO> RoleSearchResultPanel(final String id, final boolean filtered,
final NodeCond searchCond, final PageReference callerRef,
final AbstractAttributableRestClient restClient) {
-
+
super(id, filtered, searchCond, callerRef, restClient);
}
-
+
@Override
protected List<IColumn<AbstractAttributableTO, String>> getColumns() {
final List<IColumn<AbstractAttributableTO, String>> columns =
new ArrayList<IColumn<AbstractAttributableTO, String>>();
-
+
final String[] colnames = {"id", "name", "entitlements"};
for (String name : colnames) {
columns.add(
new PropertyColumn<AbstractAttributableTO, String>(new ResourceModel(name, name), name, name));
}
-
+
columns.add(new AbstractColumn<AbstractAttributableTO, String>(new ResourceModel("actions", "")) {
- private static final long serialVersionUID = -3503023501954863131L;
+ private static final long serialVersionUID = -3503023501954863131L;
+
@Override
public String getCssClass() {
return "action";
}
-
+
@Override
public void populateItem(final Item<ICellPopulator<AbstractAttributableTO>> cellItem,
final String componentId, final IModel<AbstractAttributableTO> model) {
-
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
-
+
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, page.getPageReference());
+
panel.add(new ActionLink() {
-
+
private static final long serialVersionUID = -3722207913631435501L;
-
+
@Override
public void onClick(final AjaxRequestTarget target) {
statusmodal.setPageCreator(new ModalWindow.PageCreator() {
-
+
private static final long serialVersionUID = -7834632442532690940L;
-
+
@Override
public Page createPage() {
return new StatusModalPage(page.getPageReference(), statusmodal, model.getObject());
}
});
-
+
statusmodal.show(target);
}
}, ActionLink.ActionType.SEARCH, "Roles", "read");
-
+
panel.add(new ActionLink() {
-
+
private static final long serialVersionUID = -3722207913631435501L;
-
+
@Override
public void onClick(final AjaxRequestTarget target) {
editmodal.setPageCreator(new ModalWindow.PageCreator() {
-
+
private static final long serialVersionUID = -7834632442532690940L;
-
+
@Override
public Page createPage() {
return new RoleModalPage(
page.getPageReference(), editmodal, (RoleTO) model.getObject());
}
});
-
+
editmodal.show(target);
}
}, ActionLink.ActionType.EDIT, "Roles", "update");
-
+
panel.add(new ActionLink() {
-
+
private static final long serialVersionUID = -3722207913631435501L;
-
+
@Override
public void onClick(final AjaxRequestTarget target) {
try {
final RoleTO roleTO = (RoleTO) restClient.delete(model.getObject().getId());
-
+
page.setModalResult(true);
-
+
editmodal.setPageCreator(new ModalWindow.PageCreator() {
-
+
private static final long serialVersionUID = -7834632442532690940L;
-
+
@Override
public Page createPage() {
return new ResultStatusModalPage(editmodal, roleTO);
}
});
-
+
editmodal.show(target);
} catch (SyncopeClientCompositeErrorException scce) {
error(getString("operation_error") + ": " + scce.getMessage());
@@ -147,11 +148,11 @@ public class RoleSearchResultPanel exten
}
}
}, ActionLink.ActionType.DELETE, "Roles", "delete");
-
+
cellItem.add(panel);
}
});
-
+
return columns;
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java Mon Feb 18 09:19:25 2013
@@ -23,10 +23,10 @@ import org.apache.syncope.common.search.
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.console.pages.RoleModalPage;
import org.apache.syncope.console.rest.UserRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.tree.TreeActionLinkPanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -44,14 +44,14 @@ public class RoleTabPanel extends Panel
private UserRestClient restClient;
public RoleTabPanel(final String id, final RoleTO roleTO, final ModalWindow window,
- final PageReference callerPageRef) {
+ final PageReference pageRef) {
super(id);
final Form form = new Form("roleForm");
final TreeActionLinkPanel actionLink = new TreeActionLinkPanel("actionLink", roleTO.getId(),
- new CompoundPropertyModel(roleTO), window, callerPageRef);
+ new CompoundPropertyModel(roleTO), window, pageRef);
this.add(actionLink);
this.add(new Label("displayName", roleTO.getDisplayName()));
@@ -59,7 +59,7 @@ public class RoleTabPanel extends Panel
form.setModel(new CompoundPropertyModel(roleTO));
form.setOutputMarkupId(true);
- final RolePanel rolePanel = new RolePanel("rolePanel", form, roleTO, RoleModalPage.Mode.ADMIN);
+ final RolePanel rolePanel = new RolePanel("rolePanel", form, roleTO, RoleModalPage.Mode.ADMIN, pageRef);
rolePanel.setEnabled(false);
form.add(rolePanel);
@@ -67,25 +67,21 @@ public class RoleTabPanel extends Panel
userListContainer.setOutputMarkupId(true);
userListContainer.setEnabled(true);
- userListContainer.add(new UserSearchResultPanel("userList", true, null, callerPageRef, restClient));
- userListContainer.add(new IndicatingAjaxButton("search", new ResourceModel("search")) {
+ userListContainer.add(new UserSearchResultPanel("userList", true, null, pageRef, restClient));
+ userListContainer.add(new ClearIndicatingAjaxButton("search", new ResourceModel("search"), pageRef) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
final MembershipCond membershipCond = new MembershipCond();
membershipCond.setRoleName(roleTO.getName());
NodeCond cond = NodeCond.getLeafCond(membershipCond);
- userListContainer.replace(new UserSearchResultPanel("userList", true, cond, callerPageRef, restClient));
+ userListContainer.replace(new UserSearchResultPanel("userList", true, cond, pageRef, restClient));
target.add(userListContainer);
}
-
- @Override
- protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- }
});
form.add(userListContainer);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java Mon Feb 18 09:19:25 2013
@@ -30,6 +30,7 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.Tasks;
import org.apache.syncope.console.pages.Tasks.TasksProvider;
import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
@@ -41,7 +42,6 @@ import org.apache.wicket.ajax.form.AjaxF
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -87,7 +87,7 @@ public class SchedTasks extends Panel {
private AjaxFallbackDefaultDataTable<TaskTO, String> table;
- public SchedTasks(final String id, final PageReference callerPageRef) {
+ public SchedTasks(final String id, final PageReference pageRef) {
super(id);
@@ -102,7 +102,7 @@ public class SchedTasks extends Panel {
window.setCookieName("view-task-win");
add(window);
- ((Tasks) callerPageRef.getPage()).setWindowClosedCallback(window, container);
+ ((Tasks) pageRef.getPage()).setWindowClosedCallback(window, container);
paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_SCHED_TASKS_PAGINATOR_ROWS);
@@ -138,7 +138,7 @@ public class SchedTasks extends Panel {
final SchedTaskTO taskTO = (SchedTaskTO) model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
panel.add(new ActionLink() {
@@ -146,14 +146,13 @@ public class SchedTasks extends Panel {
@Override
public void onClick(final AjaxRequestTarget target) {
-
window.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@Override
public Page createPage() {
- return new SchedTaskModalPage(window, taskTO, callerPageRef);
+ return new SchedTaskModalPage(window, taskTO, pageRef);
}
});
@@ -226,12 +225,12 @@ public class SchedTasks extends Panel {
container.add(table);
- final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ final AjaxLink reload = new ClearIndicatingAjaxLink("reload", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(AjaxRequestTarget target) {
+ protected void onClickInternal(AjaxRequestTarget target) {
if (target != null) {
target.add(table);
}
@@ -275,7 +274,7 @@ public class SchedTasks extends Panel {
columns,
new TasksProvider<SchedTaskTO>(restClient, paginatorRows, getId(), SchedTaskTO.class),
container,
- table == null ? 0 : (int)table.getCurrentPage());
+ table == null ? 0 : (int) table.getCurrentPage());
target.add(container);
}
@@ -284,19 +283,19 @@ public class SchedTasks extends Panel {
paginatorForm.add(rowsChooser);
add(paginatorForm);
- AjaxLink createLink = new IndicatingAjaxLink("createLink") {
+ AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
window.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@Override
public Page createPage() {
- return new SchedTaskModalPage(window, new SchedTaskTO(), callerPageRef);
+ return new SchedTaskModalPage(window, new SchedTaskTO(), pageRef);
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SelectOnlyUserSearchResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SelectOnlyUserSearchResultPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SelectOnlyUserSearchResultPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SelectOnlyUserSearchResultPanel.java Mon Feb 18 09:19:25 2013
@@ -42,17 +42,17 @@ public class SelectOnlyUserSearchResultP
private static final long serialVersionUID = 2146781496050131930L;
- private final PageReference callerRef;
+ private final PageReference pageRef;
private final ModalWindow window;
public <T extends AbstractAttributableTO> SelectOnlyUserSearchResultPanel(final String id, final boolean filtered,
- final NodeCond searchCond, final PageReference callerRef, final ModalWindow window,
+ final NodeCond searchCond, final PageReference pageRef, final ModalWindow window,
final UserRestClient restClient) {
- super(id, filtered, searchCond, callerRef, restClient);
+ super(id, filtered, searchCond, pageRef, restClient);
- this.callerRef = callerRef;
+ this.pageRef = pageRef;
this.window = window;
container.get("reload").setEnabled(false);
@@ -78,7 +78,7 @@ public class SelectOnlyUserSearchResultP
public void populateItem(final Item<ICellPopulator<AbstractAttributableTO>> cellItem,
final String componentId, final IModel<AbstractAttributableTO> rowModel) {
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, rowModel);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, rowModel, pageRef);
panel.add(new ActionLink() {
@@ -86,7 +86,7 @@ public class SelectOnlyUserSearchResultP
@Override
public void onClick(final AjaxRequestTarget target) {
- send(callerRef.getPage(), Broadcast.BREADTH, new RoleDetailsPanel.UserOwnerSelectPayload(
+ send(pageRef.getPage(), Broadcast.BREADTH, new RoleDetailsPanel.UserOwnerSelectPayload(
rowModel.getObject().getId()));
window.close(target);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java Mon Feb 18 09:19:25 2013
@@ -32,6 +32,7 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.Tasks.TasksProvider;
import org.apache.syncope.console.pages.UserTemplateModalPage;
import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
@@ -43,7 +44,6 @@ import org.apache.wicket.ajax.form.AjaxF
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -89,7 +89,7 @@ public class SyncTasks extends Panel {
private AjaxFallbackDefaultDataTable<TaskTO, String> table;
- public SyncTasks(String id, final PageReference callerPageRef) {
+ public SyncTasks(final String id, final PageReference pageRef) {
super(id);
container = new WebMarkupContainer("container");
@@ -103,7 +103,7 @@ public class SyncTasks extends Panel {
window.setCookieName("view-task-win");
add(window);
- ((Tasks) callerPageRef.getPage()).setWindowClosedCallback(window, container);
+ ((Tasks) pageRef.getPage()).setWindowClosedCallback(window, container);
paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_SYNC_TASKS_PAGINATOR_ROWS);
@@ -139,7 +139,7 @@ public class SyncTasks extends Panel {
final SyncTaskTO taskTO = (SyncTaskTO) model.getObject();
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
panel.add(new ActionLink() {
@@ -154,7 +154,7 @@ public class SyncTasks extends Panel {
@Override
public Page createPage() {
- return new SyncTaskModalPage(window, taskTO, callerPageRef);
+ return new SyncTaskModalPage(window, taskTO, pageRef);
}
});
@@ -175,7 +175,7 @@ public class SyncTasks extends Panel {
@Override
public Page createPage() {
- return new UserTemplateModalPage(callerPageRef, window, taskTO);
+ return new UserTemplateModalPage(pageRef, window, taskTO);
}
});
@@ -196,7 +196,7 @@ public class SyncTasks extends Panel {
@Override
public Page createPage() {
- return new RoleTemplateModalPage(callerPageRef, window, taskTO);
+ return new RoleTemplateModalPage(pageRef, window, taskTO);
}
});
@@ -269,12 +269,12 @@ public class SyncTasks extends Panel {
container.add(table);
- final AjaxLink reload = new IndicatingAjaxLink("reload") {
+ final AjaxLink reload = new ClearIndicatingAjaxLink("reload", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(AjaxRequestTarget target) {
+ protected void onClickInternal(AjaxRequestTarget target) {
if (target != null) {
target.add(table);
}
@@ -287,7 +287,6 @@ public class SyncTasks extends Panel {
@Override
public void onComponentTag(final Component component, final ComponentTag tag) {
-
if (table.getRowCount() > paginatorRows) {
tag.remove("class");
tag.put("class", "settingsPosMultiPage");
@@ -328,19 +327,19 @@ public class SyncTasks extends Panel {
add(paginatorForm);
// create new user
- AjaxLink createLink = new IndicatingAjaxLink("createLink") {
+ AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", pageRef) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ protected void onClickInternal(final AjaxRequestTarget target) {
window.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@Override
public Page createPage() {
- return new SyncTaskModalPage(window, new SyncTaskTO(), callerPageRef);
+ return new SyncTaskModalPage(window, new SyncTaskTO(), pageRef);
}
});
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchPanel.java Mon Feb 18 09:19:25 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.List;
-
import org.apache.syncope.common.search.NodeCond;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.types.AttributableType;
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=1447162&r1=1447161&r2=1447162&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 Mon Feb 18 09:19:25 2013
@@ -114,7 +114,7 @@ public class UserSearchResultPanel exten
public void populateItem(final Item<ICellPopulator<AbstractAttributableTO>> cellItem,
final String componentId, final IModel<AbstractAttributableTO> model) {
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, page.getPageReference());
panel.add(new ActionLink() {