Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BB2A4200CD8 for ; Wed, 2 Aug 2017 16:35:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B96CF169911; Wed, 2 Aug 2017 14:35:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B373016990E for ; Wed, 2 Aug 2017 16:35:30 +0200 (CEST) Received: (qmail 3102 invoked by uid 500); 2 Aug 2017 14:35:29 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 3045 invoked by uid 99); 2 Aug 2017 14:35:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Aug 2017 14:35:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0C088E10F8; Wed, 2 Aug 2017 14:35:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: skylark17@apache.org To: commits@syncope.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: syncope git commit: [SYNCOPE-1183] 'realm' attribute is now added as a default column in 'Realms' view Date: Wed, 2 Aug 2017 14:35:28 +0000 (UTC) archived-at: Wed, 02 Aug 2017 14:35:31 -0000 Repository: syncope Updated Branches: refs/heads/2_0_X 0a0bf05c4 -> e1a9e9e7f [SYNCOPE-1183] 'realm' attribute is now added as a default column in 'Realms' view Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e1a9e9e7 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e1a9e9e7 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e1a9e9e7 Branch: refs/heads/2_0_X Commit: e1a9e9e7f66335247d0b21722bce72cc07cfd296 Parents: 0a0bf05 Author: skylark17 Authored: Wed Aug 2 16:34:55 2017 +0200 Committer: skylark17 Committed: Wed Aug 2 16:34:55 2017 +0200 ---------------------------------------------------------------------- .../client/console/panels/AnyDirectoryPanel.java | 2 +- .../panels/AnyObjectDisplayAttributesModalPanel.java | 2 +- .../console/panels/DisplayAttributesModalPanel.java | 12 ++++++------ .../panels/GroupDisplayAttributesModalPanel.java | 2 +- .../console/panels/UserDisplayAttributesModalPanel.java | 2 +- .../client/console/panels/DirectoryPanel.properties | 1 + .../client/console/panels/DirectoryPanel_it.properties | 1 + .../console/panels/DirectoryPanel_pt_BR.properties | 1 + .../client/console/panels/DirectoryPanel_ru.properties | 1 + .../syncope/common/lib/search/SearchableFields.java | 2 +- 10 files changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java index d4f0bcd..5a481ff 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java @@ -168,7 +168,7 @@ public abstract class AnyDirectoryPanel extend private static final long serialVersionUID = 5194630813773543054L; - public static final String[] DEFAULT_SELECTION = { "name" }; + public static final String[] DEFAULT_SELECTION = { "name", "realm" }; public AnyObjectDisplayAttributesModalPanel( final BaseModal modal, http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/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 344356d..a87577d 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 @@ -113,12 +113,12 @@ public abstract class DisplayAttributesModalPanel extend } }; - selectedDetails - = prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefDetailView(type)); - selectedPlainSchemas - = prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefPlainAttributeView(type)); - selectedDerSchemas - = prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefDerivedAttributeView(type)); + selectedDetails = + prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefDetailView(type)); + selectedPlainSchemas = + prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefPlainAttributeView(type)); + selectedDerSchemas = + prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefDerivedAttributeView(type)); final WebMarkupContainer container = new WebMarkupContainer("container"); container.setOutputMarkupId(true); http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDisplayAttributesModalPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDisplayAttributesModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDisplayAttributesModalPanel.java index e35a8ad..d86447a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDisplayAttributesModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDisplayAttributesModalPanel.java @@ -34,7 +34,7 @@ public class GroupDisplayAttributesModalPanel extends Di private static final long serialVersionUID = 5194630813773543054L; - public static final String[] DEFAULT_SELECTION = { "name" }; + public static final String[] DEFAULT_SELECTION = { "name", "realm" }; public GroupDisplayAttributesModalPanel( final BaseModal modal, http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDisplayAttributesModalPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDisplayAttributesModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDisplayAttributesModalPanel.java index 24e701e..e267308 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDisplayAttributesModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDisplayAttributesModalPanel.java @@ -34,7 +34,7 @@ public class UserDisplayAttributesModalPanel extends Dis private static final long serialVersionUID = 5194630813773543054L; - public static final String[] DEFAULT_SELECTION = { "username", "status", "mustChangePassword" }; + public static final String[] DEFAULT_SELECTION = { "username", "status", "mustChangePassword", "realm" }; public UserDisplayAttributesModalPanel( final BaseModal modal, http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties index f57095d..5323044 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties @@ -25,6 +25,7 @@ username=Username creationDate=Creation Date tokenValued=Valued tokenNotValued=Not valued +realm=Realm subject=Subject recipients=Recipients http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties index baf489c..1af71ab 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties @@ -25,6 +25,7 @@ username=Nome utente creationDate=Data Creazione tokenValued=Valorizzato tokenNotValued=Non valorizzato +realm=Realm subject=Oggetto recipients=Destinatari http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties index 063712c..9082591 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties @@ -25,6 +25,7 @@ username=Nome de Usu\u00e1rio creationDate=Data de Cria\u00e7\u00e3o tokenValued=Atribu\u00eddo tokenNotValued=N\u00e3o Atribu\u00eddo +realm=Realm subject=Assunto recipients=Destinat\u00e1rios http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties index 853e27b..998d409 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties @@ -26,6 +26,7 @@ username=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u04 creationDate=\u0414\u0430\u0442\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f tokenValued=\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d tokenNotValued=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 +realm=Realm subject=\u0422\u0435\u043c\u0430 recipients=\u041f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0438 http://git-wip-us.apache.org/repos/asf/syncope/blob/e1a9e9e7/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java index b4facfe..5dbf149 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java @@ -36,7 +36,7 @@ import org.apache.syncope.common.lib.types.AnyTypeKind; public final class SearchableFields { private static final String[] ATTRIBUTES_NOTINCLUDED = { - "serialVersionUID", "password", "type", "realm", "udynMembershipCond" + "serialVersionUID", "password", "type", "udynMembershipCond" }; private static final Set ANY_FIELDS = new HashSet<>();