syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From matte...@apache.org
Subject syncope git commit: [SYNCOPE-979]-adding resource column in user propagation tasks table
Date Fri, 02 Dec 2016 15:18:40 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 9722c9218 -> db0695107


[SYNCOPE-979]-adding resource column in user propagation tasks table


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/db069510
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/db069510
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/db069510

Branch: refs/heads/master
Commit: db06951074ce82882bdc6bab9829f8bc60de221f
Parents: 9722c92
Author: Matteo Di Carlo <matteo.dicarlo@tirasa.net>
Authored: Thu Dec 1 16:18:44 2016 +0100
Committer: Matteo Di Carlo <matteo.dicarlo@tirasa.net>
Committed: Fri Dec 2 16:17:06 2016 +0100

----------------------------------------------------------------------
 .../client/console/panels/DisplayAttributesModalPanel.java  | 8 +++++++-
 .../client/console/tasks/PropagationTaskDirectoryPanel.java | 9 +++++++--
 .../console/tasks/PropagationTaskDirectoryPanel.properties  | 1 +
 .../tasks/PropagationTaskDirectoryPanel_it.properties       | 1 +
 .../tasks/PropagationTaskDirectoryPanel_pt_BR.properties    | 1 +
 .../tasks/PropagationTaskDirectoryPanel_ru.properties       | 1 +
 6 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
index bbe8a19..106ba0c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.client.console.panels;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -81,13 +82,18 @@ public abstract class DisplayAttributesModalPanel<T extends Serializable>
extend
         super(modal, pageRef);
         this.type = type;
 
+        final List<String> detailslList = SearchableFields.get(getTOClass());
+        Collections.sort(detailslList);
+        Collections.sort(pSchemaNames);
+        Collections.sort(dSchemaNames);
+
         final IModel<List<String>> fnames = new LoadableDetachableModel<List<String>>()
{
 
             private static final long serialVersionUID = 5275935387613157437L;
 
             @Override
             protected List<String> load() {
-                return SearchableFields.get(getTOClass());
+                return detailslList;
             }
         };
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/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 0bb8e90..a8e3f9a 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
@@ -80,8 +80,13 @@ public abstract class PropagationTaskDirectoryPanel
         columns.add(new PropertyColumn<PropagationTaskTO, String>(new StringResourceModel(
                 "operation", this, null), "operation", "operation"));
 
-        columns.add(new PropertyColumn<PropagationTaskTO, String>(
-                new StringResourceModel("anyTypeKind", this, null), "anyTypeKind", "anyTypeKind"));
+        if (resource == null) {
+            columns.add(new PropertyColumn<PropagationTaskTO, String>(new StringResourceModel(
+                    "resource", this, null), "resource", "resource"));
+        } else {
+            columns.add(new PropertyColumn<PropagationTaskTO, String>(
+                    new StringResourceModel("anyTypeKind", this, null), "anyTypeKind", "anyTypeKind"));
+        }
 
         columns.add(new PropertyColumn<PropagationTaskTO, String>(
                 new StringResourceModel("entityKey", this, null), "entityKey", "entityKey"));

http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
index 83b7a7d..32c785a 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
@@ -19,3 +19,4 @@ anyTypeKind=Object Type
 entityKey=Local ID
 connObjectKey=Remote ID
 task.view=${right.operation} task about ${right.anyTypeKind}
+resource=Resource

http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
index 7d5d932..91e61fe 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
@@ -19,3 +19,4 @@ anyTypeKind=Tipo Oggetto
 entityKey=ID Locale
 connObjectKey=ID Remoto
 task.view=${right.operation} task per ${right.anyTypeKind}
+resource=risorsa

http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
index 83b7a7d..cb14e4b 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
@@ -19,3 +19,4 @@ anyTypeKind=Object Type
 entityKey=Local ID
 connObjectKey=Remote ID
 task.view=${right.operation} task about ${right.anyTypeKind}
+resource=Recurso

http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
index d56f220..7a5fe3d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
@@ -20,3 +20,4 @@ anyTypeKind=\u041e\u0431\u044a\u0435\u043a\u0442
 entityKey=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440
 connObjectKey=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440
\u0432 \u0440\u0435\u0441\u0443\u0440\u0441\u0435
 task.view=\u0417\u0430\u0434\u0430\u0447\u0430 ${right.operation} \u0434\u043b\u044f ${right.anyTypeKind}
+resource=Pecypce


Mime
View raw message