Author: ilgrosso
Date: Mon Dec 30 14:28:15 2013
New Revision: 1554232
URL: http://svn.apache.org/r1554232
Log:
[SYNCOPE-465] Adding AjaxFormChoiceComponentUpdatingBehavior to CheckGroup
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1554232&r1=1554231&r2=1554232&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
(original)
+++
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
Mon Dec 30 14:28:15 2013
@@ -153,53 +153,57 @@ public class Resources extends BasePage
private void setupResources() {
List<IColumn<ResourceTO, String>> columns = new
ArrayList<IColumn<ResourceTO, String>>();
- columns.add(new PropertyColumn(new StringResourceModel("name", this,
null), "name", "name"));
+ columns.add(new PropertyColumn<ResourceTO, String>(
+ new StringResourceModel("name", this, null), "name", "name"));
columns.add(new AbstractColumn<ResourceTO, String>(
new StringResourceModel("connector", this, null, "connector"))
{
- private static final long serialVersionUID = 8263694778917279290L;
+ private static final long serialVersionUID =
8263694778917279290L;
- @Override
- public void populateItem(final Item<ICellPopulator<ResourceTO>>
cellItem, final String componentId,
- final IModel<ResourceTO> rowModel) {
+ @Override
+ public void populateItem(final
Item<ICellPopulator<ResourceTO>> cellItem, final String componentId,
+ final IModel<ResourceTO> rowModel) {
- final AjaxLink<String> editLink = new
ClearIndicatingAjaxLink<String>("link", getPageReference()) {
+ final AjaxLink<String> editLink =
+ new ClearIndicatingAjaxLink<String>("link",
getPageReference()) {
- private static final long serialVersionUID =
-7978723352517770644L;
+ private static final long serialVersionUID =
-7978723352517770644L;
- @Override
- protected void onClickInternal(final AjaxRequestTarget
target) {
+ @Override
+ protected void onClickInternal(final
AjaxRequestTarget target) {
- editConnectorWin.setPageCreator(new
ModalWindow.PageCreator() {
+ editConnectorWin.setPageCreator(new
ModalWindow.PageCreator() {
- private static final long serialVersionUID =
-7834632442532690940L;
+ private static final long serialVersionUID
= -7834632442532690940L;
- @Override
- public Page createPage() {
- return new
ConnectorModalPage(Resources.this.getPageReference(), editConnectorWin,
-
connectorRestClient.read(rowModel.getObject().getConnectorId()));
- }
- });
+ @Override
+ public Page createPage() {
+ return new
ConnectorModalPage(Resources.this.getPageReference(),
+ editConnectorWin,
+
connectorRestClient.read(rowModel.getObject().getConnectorId()));
+ }
+ });
- editConnectorWin.show(target);
- }
- };
- editLink.add(new Label("linkTitle",
rowModel.getObject().getConnectorDisplayName()));
+ editConnectorWin.show(target);
+ }
+ };
+ editLink.add(new Label("linkTitle",
rowModel.getObject().getConnectorDisplayName()));
- LinkPanel editConnPanel = new LinkPanel(componentId);
- editConnPanel.add(editLink);
+ LinkPanel editConnPanel = new LinkPanel(componentId);
+ editConnPanel.add(editLink);
- cellItem.add(editConnPanel);
+ cellItem.add(editConnPanel);
- MetaDataRoleAuthorizationStrategy.authorize(editConnPanel,
ENABLE, xmlRolesReader.getAllAllowedRoles(
- "Connectors", "read"));
- }
- });
+
MetaDataRoleAuthorizationStrategy.authorize(editConnPanel, ENABLE,
xmlRolesReader.
+ getAllAllowedRoles(
+ "Connectors", "read"));
+ }
+ });
- columns.add(new PropertyColumn(new StringResourceModel(
+ columns.add(new PropertyColumn<ResourceTO, String>(new
StringResourceModel(
"propagationPrimary", this, null), "propagationPrimary",
"propagationPrimary"));
- columns.add(new PropertyColumn(new StringResourceModel(
+ columns.add(new PropertyColumn<ResourceTO, String>(new
StringResourceModel(
"propagationPriority", this, null), "propagationPriority",
"propagationPriority"));
columns.add(new AbstractColumn<ResourceTO, String>(new
StringResourceModel("actions", this, null, "")) {
@@ -271,7 +275,7 @@ public class Resources extends BasePage
columns,
(ISortableDataProvider<ResourceTO, String>) new
ResourcesProvider(),
resourcePaginatorRows,
- Arrays.asList(new ActionLink.ActionType[]
{ActionLink.ActionType.DELETE}),
+ Arrays.asList(new ActionLink.ActionType[] {
ActionLink.ActionType.DELETE }),
resourceRestClient,
"name",
"Resources",
@@ -426,7 +430,7 @@ public class Resources extends BasePage
columns,
(ISortableDataProvider<ConnInstanceTO, String>) new
ConnectorsProvider(),
connectorPaginatorRows,
- Arrays.asList(new ActionLink.ActionType[]
{ActionLink.ActionType.DELETE}),
+ Arrays.asList(new ActionLink.ActionType[] {
ActionLink.ActionType.DELETE }),
connectorRestClient,
"id",
"Connectors",
@@ -603,4 +607,4 @@ public class Resources extends BasePage
((AbstractSearchResultPanel.EventDataWrapper)
event.getPayload()).getTarget().add(connectorContainer);
}
}
-}
\ No newline at end of file
+}
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java?rev=1554232&r1=1554231&r2=1554232&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
(original)
+++
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
Mon Dec 30 14:28:15 2013
@@ -32,6 +32,7 @@ import org.apache.syncope.console.wicket
import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import
org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
@@ -46,12 +47,12 @@ import org.slf4j.LoggerFactory;
public class AjaxDataTablePanel<T, S> extends Panel {
+ private static final long serialVersionUID = -8826989026203543957L;
+
/**
* Logger.
*/
- protected static final Logger LOG =
LoggerFactory.getLogger(AjaxDataTablePanel.class);
-
- private static final long serialVersionUID = -8826989026203543957L;
+ private static final Logger LOG =
LoggerFactory.getLogger(AjaxDataTablePanel.class);
private final CheckGroup<T> group;
@@ -63,23 +64,6 @@ public class AjaxDataTablePanel<T, S> ex
final String id,
final List<IColumn<T, S>> columns,
final ISortableDataProvider<T, S> dataProvider,
- final int rowsPerPage) {
- super(id);
-
- this.bulkActionForm = null;
- this.group = null;
- dataTable = new AjaxFallbackDefaultDataTable<T, S>("dataTable",
columns, dataProvider, rowsPerPage);
-
- Fragment fragment = new Fragment("tablePanel", "bulkNotAvailable",
this);
- fragment.add(dataTable);
-
- add(fragment);
- }
-
- public AjaxDataTablePanel(
- final String id,
- final List<IColumn<T, S>> columns,
- final ISortableDataProvider<T, S> dataProvider,
final int rowsPerPage,
final Collection<ActionLink.ActionType> actions,
final BaseRestClient bulkActionExecutor,
@@ -128,6 +112,15 @@ public class AjaxDataTablePanel<T, S> ex
fragment.add(bulkActionForm);
group = new CheckGroup<T>("checkgroup", new ArrayList<T>());
+ group.add(new AjaxFormChoiceComponentUpdatingBehavior() {
+
+ private static final long serialVersionUID = -151291731388673682L;
+
+ @Override
+ protected void onUpdate(final AjaxRequestTarget target) {
+ }
+
+ });
bulkActionForm.add(group);
columns.add(0, new CheckGroupColumn<T, S>(group));
