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 2019/03/04 11:58:46 UTC
[syncope] branch 2_0_X updated: [SYNCOPE-1443] Reconciliation:
pagination setup missing
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new bd76281 [SYNCOPE-1443] Reconciliation: pagination setup missing
bd76281 is described below
commit bd76281c0f866abefff434960d55f692e8945277
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Mar 4 12:48:36 2019 +0100
[SYNCOPE-1443] Reconciliation: pagination setup missing
---
.../org/apache/syncope/client/console/commons/Constants.java | 4 ++++
.../console/commons/status/AbstractStatusBeanProvider.java | 4 ++--
.../syncope/client/console/status/AnyStatusDirectoryPanel.java | 9 ++++-----
.../client/console/status/ResourceStatusDirectoryPanel.java | 9 +++++----
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index 652aa6e..9044eb6 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -123,6 +123,10 @@ public final class Constants {
public static final String PREF_RESOURCES_PAGINATOR_ROWS = "resources.paginator.rows";
+ public static final String PREF_RECONCILIATION_PAGINATOR_ROWS = "reconciliation.paginator.rows";
+
+ public static final String PREF_RESOURCE_STATUS_PAGINATOR_ROWS = "resource.status.paginator.rows";
+
public static final String PREF_CONNECTORS_PAGINATOR_ROWS = "connectors.paginator.rows";
public static final String PREF_NOTIFICATION_PAGINATOR_ROWS = "notification.paginator.rows";
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java
index 50619e5..e4b03ab 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java
@@ -32,8 +32,8 @@ public abstract class AbstractStatusBeanProvider extends DirectoryDataProvider<S
protected final SortableDataProviderComparator<StatusBean> comparator;
- public AbstractStatusBeanProvider(final String sort) {
- super(10);
+ public AbstractStatusBeanProvider(final int paginatorRows, final String sort) {
+ super(paginatorRows);
setSort(sort, SortOrder.ASCENDING);
comparator = new SortableDataProviderComparator<>(this);
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
index 468ecaf..d27c3fd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.PredicateUtils;
import org.apache.commons.collections4.Transformer;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
@@ -273,20 +272,20 @@ public class AnyStatusDirectoryPanel
@Override
protected AnyStatusProvider dataProvider() {
- return new AnyStatusProvider();
+ return new AnyStatusProvider(rows);
}
@Override
protected String paginatorRowsKey() {
- return StringUtils.EMPTY;
+ return Constants.PREF_RESOURCE_STATUS_PAGINATOR_ROWS;
}
protected class AnyStatusProvider extends AbstractStatusBeanProvider {
private static final long serialVersionUID = 4586969457669796621L;
- AnyStatusProvider() {
- super("resource");
+ AnyStatusProvider(final int paginatorRows) {
+ super(paginatorRows, "resource");
}
@Override
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
index 4bfb00e..38b40d5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Transformer;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.status.AbstractStatusBeanProvider;
import org.apache.syncope.client.console.commons.status.StatusBean;
@@ -230,12 +231,12 @@ public class ResourceStatusDirectoryPanel
@Override
protected ResourceStatusDataProvider dataProvider() {
- return new ResourceStatusDataProvider();
+ return new ResourceStatusDataProvider(rows);
}
@Override
protected String paginatorRowsKey() {
- return StringUtils.EMPTY;
+ return Constants.PREF_RECONCILIATION_PAGINATOR_ROWS;
}
protected class ResourceStatusDataProvider extends AbstractStatusBeanProvider {
@@ -246,8 +247,8 @@ public class ResourceStatusDirectoryPanel
private final AbstractAnyRestClient<? extends AnyTO> restClient;
- public ResourceStatusDataProvider() {
- super(AnyTypeKind.USER.name().equals(type) ? "username" : "name");
+ public ResourceStatusDataProvider(final int paginatorRows) {
+ super(paginatorRows, AnyTypeKind.USER.name().equals(type) ? "username" : "name");
if (StringUtils.isEmpty(type)) {
fiql = null;