You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by sk...@apache.org on 2017/11/27 10:44:24 UTC

syncope git commit: [SYNCOPE-1226] Removed schemas are now correctly no more displayed in 'Selected' list in 'Attributes to be displayed' view

Repository: syncope
Updated Branches:
  refs/heads/2_0_X 96219bedd -> 0e11d0b6c


[SYNCOPE-1226] Removed schemas are now correctly no more displayed in 'Selected' list in 'Attributes to be displayed' view


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

Branch: refs/heads/2_0_X
Commit: 0e11d0b6c3e20b11775537b0047353eca3e8aac2
Parents: 96219be
Author: skylark17 <ma...@tirasa.net>
Authored: Mon Nov 27 11:44:17 2017 +0100
Committer: skylark17 <ma...@tirasa.net>
Committed: Mon Nov 27 11:44:17 2017 +0100

----------------------------------------------------------------------
 .../client/console/panels/DisplayAttributesModalPanel.java       | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/0e11d0b6/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 a87577d..2b36dc2 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
@@ -120,6 +120,10 @@ public abstract class DisplayAttributesModalPanel<T extends Serializable> extend
         selectedDerSchemas =
                 prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefDerivedAttributeView(type));
 
+        // remove old schemas from selected lists
+        selectedPlainSchemas.retainAll(pSchemaNames);
+        selectedDerSchemas.retainAll(dSchemaNames);
+        
         final WebMarkupContainer container = new WebMarkupContainer("container");
         container.setOutputMarkupId(true);
         add(container);