This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 4ce9519 [SYNCOPE-1443] Reconciliation: pagination setup missing
4ce9519 is described below
commit 4ce9519705ec1654feff660b4992aac9ad6c90d5
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Mar 4 12:48:36 2019 +0100
[SYNCOPE-1443] Reconciliation: pagination setup missing
---
.../console/commons/status/AbstractStatusBeanProvider.java | 4 ++--
.../syncope/client/console/status/AnyStatusDirectoryPanel.java | 9 ++++-----
.../client/console/status/ResourceStatusDirectoryPanel.java | 9 +++++----
.../org/apache/syncope/client/console/commons/Constants.java | 4 ++++
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java
index 93303b8..7992362 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java
@@ -31,8 +31,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/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
index 222b278..afd03a2 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-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;
@@ -265,20 +264,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/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
index e3bdd0b..b0582f9 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
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;
@@ -228,12 +229,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 {
@@ -244,8 +245,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;
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index d0e2966..ec1a759 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -127,6 +127,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";
