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 2017/09/15 14:31:23 UTC
[3/4] syncope git commit: Fixing propagation tasks pagination
Fixing propagation tasks pagination
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1fb88619
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1fb88619
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1fb88619
Branch: refs/heads/master
Commit: 1fb88619787848f144b42d16d56228c2c3b2c339
Parents: 6da490d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 15 16:22:34 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 15 16:31:05 2017 +0200
----------------------------------------------------------------------
.../syncope/client/console/commons/TaskDataProvider.java | 11 +----------
.../console/tasks/NotificationTaskDirectoryPanel.java | 7 ++++++-
.../console/tasks/PropagationTaskDirectoryPanel.java | 7 ++++++-
.../client/console/tasks/SchedTaskDirectoryPanel.java | 9 +++++++--
4 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/1fb88619/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java
index 5e917d1..46312cb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.client.console.commons;
-import org.apache.syncope.client.console.rest.TaskRestClient;
import org.apache.syncope.common.lib.to.AbstractTaskTO;
import org.apache.syncope.common.lib.types.TaskType;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
@@ -33,12 +32,9 @@ public abstract class TaskDataProvider<T extends AbstractTaskTO> extends Directo
protected final TaskType taskType;
- private final TaskRestClient taskRestClient;
-
- public TaskDataProvider(final int paginatorRows, final TaskType taskType, final TaskRestClient taskRestClient) {
+ public TaskDataProvider(final int paginatorRows, final TaskType taskType) {
super(paginatorRows);
- this.taskRestClient = taskRestClient;
setSort("start", SortOrder.ASCENDING);
comparator = new SortableDataProviderComparator<>(this);
this.taskType = taskType;
@@ -49,11 +45,6 @@ public abstract class TaskDataProvider<T extends AbstractTaskTO> extends Directo
}
@Override
- public long size() {
- return taskRestClient.count(taskType);
- }
-
- @Override
public IModel<T> model(final T object) {
return new CompoundPropertyModel<>(object);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/1fb88619/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
index fd73ab0..70dae9b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
@@ -210,13 +210,18 @@ public abstract class NotificationTaskDirectoryPanel
final String entityKey,
final int paginatorRows) {
- super(paginatorRows, TaskType.NOTIFICATION, restClient);
+ super(paginatorRows, TaskType.NOTIFICATION);
this.notification = notification;
this.anyTypeKind = anyTypeKind;
this.entityKey = entityKey;
}
@Override
+ public long size() {
+ return restClient.count(TaskType.NOTIFICATION);
+ }
+
+ @Override
public Iterator<NotificationTaskTO> iterator(final long first, final long count) {
final int page = ((int) first / paginatorRows);
http://git-wip-us.apache.org/repos/asf/syncope/blob/1fb88619/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
index 5d37b79..ba3b122 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
@@ -206,7 +206,12 @@ public abstract class PropagationTaskDirectoryPanel
private static final long serialVersionUID = 4725679400450513556L;
public PropagationTasksProvider(final int paginatorRows) {
- super(paginatorRows, TaskType.PROPAGATION, restClient);
+ super(paginatorRows, TaskType.PROPAGATION);
+ }
+
+ @Override
+ public long size() {
+ return restClient.count(resource, TaskType.PROPAGATION);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/1fb88619/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
index ca540b6..069e34b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
@@ -309,13 +309,18 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
private final Class<T> reference;
- public SchedTasksProvider(final Class<T> reference, final TaskType id, final int paginatorRows) {
- super(paginatorRows, id, restClient);
+ public SchedTasksProvider(final Class<T> reference, final TaskType taskType, final int paginatorRows) {
+ super(paginatorRows, taskType);
setSort("name", SortOrder.ASCENDING);
this.reference = reference;
}
@Override
+ public long size() {
+ return restClient.count(taskType);
+ }
+
+ @Override
public Iterator<T> iterator(final long first, final long count) {
int page = ((int) first / paginatorRows);