You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2015/12/21 14:25:17 UTC
syncope git commit: [SYNCOPE-156] firx for attributes to be displaied
Repository: syncope
Updated Branches:
refs/heads/master 9bc0f21e8 -> a92f400f6
[SYNCOPE-156] firx for attributes to be displaied
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a92f400f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a92f400f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a92f400f
Branch: refs/heads/master
Commit: a92f400f6458a8d789780e0d3089d98c97458b6d
Parents: 9bc0f21
Author: fmartelli <fa...@gmail.com>
Authored: Mon Dec 21 14:25:01 2015 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Mon Dec 21 14:25:01 2015 +0100
----------------------------------------------------------------------
.../syncope/client/console/commons/Constants.java | 6 +++---
.../console/pages/AnyDisplayAttributesModalPage.java | 12 ++++++++----
.../console/panels/AbstractSearchResultPanel.java | 2 +-
.../console/panels/AnyObjectSearchResultPanel.java | 9 +++++----
.../resources/META-INF/resources/css/syncopeConsole.css | 4 ----
5 files changed, 17 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a92f400f/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index 473e348..e5edbf3 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -104,11 +104,11 @@ public final class Constants {
public static final String PREF_POLICY_PAGINATOR_ROWS = "policy.paginator.rows";
- public static final String PREF_ANY_DETAILS_VIEW = "any.details.view";
+ public static final String PREF_ANY_DETAILS_VIEW = "any.%s.details.view";
- public static final String PREF_ANY_ATTRIBUTES_VIEW = "any.attributes.view";
+ public static final String PREF_ANY_ATTRIBUTES_VIEW = "any.%s.attributes.view";
- public static final String PREF_ANY_DERIVED_ATTRIBUTES_VIEW = "any.derived.attributes.view";
+ public static final String PREF_ANY_DERIVED_ATTRIBUTES_VIEW = "any.%s.derived.attributes.view";
/**
* ConnId's GuardedString is not in the classpath.
http://git-wip-us.apache.org/repos/asf/syncope/blob/a92f400f/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
index d5731ff..1995014 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
@@ -37,28 +37,32 @@ public class AnyDisplayAttributesModalPage<T extends AnyTO> extends DisplayAttri
public static final String[] ANY_DEFAULT_SELECTION = { "key" };
+ private final String type;
+
public AnyDisplayAttributesModalPage(
final BaseModal<?> modal,
final PageReference pageRef,
final List<String> schemaNames,
- final List<String> dSchemaNames) {
+ final List<String> dSchemaNames,
+ final String type) {
super(modal, pageRef, schemaNames, dSchemaNames);
+ this.type = type;
}
@Override
public String getPrefDetailView() {
- return Constants.PREF_ANY_DETAILS_VIEW;
+ return String.format(Constants.PREF_ANY_DETAILS_VIEW, type);
}
@Override
public String getPrefAttributeView() {
- return Constants.PREF_ANY_ATTRIBUTES_VIEW;
+ return String.format(Constants.PREF_ANY_ATTRIBUTES_VIEW, type);
}
@Override
public String getPrefDerivedAttributeView() {
- return Constants.PREF_ANY_DERIVED_ATTRIBUTES_VIEW;
+ return String.format(Constants.PREF_ANY_DERIVED_ATTRIBUTES_VIEW, type);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/a92f400f/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java
index 35851ab..49e3aa6 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java
@@ -108,7 +108,7 @@ public abstract class AbstractSearchResultPanel<T extends AnyTO> extends WizardM
/**
* Any type related to current panel.
*/
- private final String type;
+ protected final String type;
protected AbstractSearchResultPanel(final String id, final Builder<T> builder) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/a92f400f/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java
index 4df54bf..9469427 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java
@@ -93,7 +93,7 @@ public class AnyObjectSearchResultPanel<T extends AnyTO> extends AbstractSearchR
protected List<IColumn<T, String>> getColumns() {
final List<IColumn<T, String>> columns = new ArrayList<>();
- for (String name : prefMan.getList(getRequest(), Constants.PREF_ANY_DETAILS_VIEW)) {
+ for (String name : prefMan.getList(getRequest(), String.format(Constants.PREF_ANY_DETAILS_VIEW, type))) {
final Field field = ReflectionUtils.findField(AnyObjectTO.class, name);
if ("token".equalsIgnoreCase(name)) {
@@ -105,13 +105,14 @@ public class AnyObjectSearchResultPanel<T extends AnyTO> extends AbstractSearchR
}
}
- for (String name : prefMan.getList(getRequest(), Constants.PREF_ANY_ATTRIBUTES_VIEW)) {
+ for (String name : prefMan.getList(getRequest(), String.format(Constants.PREF_ANY_ATTRIBUTES_VIEW, type))) {
if (schemaNames.contains(name)) {
columns.add(new AttrColumn<T>(name, SchemaType.PLAIN));
}
}
- for (String name : prefMan.getList(getRequest(), Constants.PREF_ANY_DERIVED_ATTRIBUTES_VIEW)) {
+ for (String name
+ : prefMan.getList(getRequest(), String.format(Constants.PREF_ANY_DERIVED_ATTRIBUTES_VIEW, type))) {
if (dSchemaNames.contains(name)) {
columns.add(new AttrColumn<T>(name, SchemaType.DERIVED));
}
@@ -178,7 +179,7 @@ public class AnyObjectSearchResultPanel<T extends AnyTO> extends AbstractSearchR
public void onClick(final AjaxRequestTarget target, final Serializable ignore) {
// still missing content
target.add(modal.setContent(new AnyDisplayAttributesModalPage<>(
- modal, page.getPageReference(), schemaNames, dSchemaNames)));
+ modal, page.getPageReference(), schemaNames, dSchemaNames, type)));
modal.header(new ResourceModel("any.attr.display", ""));
modal.show(true);
http://git-wip-us.apache.org/repos/asf/syncope/blob/a92f400f/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
index e5b290d..5ad319f 100644
--- a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
+++ b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
@@ -344,10 +344,6 @@ div.searchResult{
clear: both;
}
-.box-body {
- min-height: 550px !important;
-}
-
.logs .input-group-addon .input-group-btn {
width: 130px !important;
}