Repository: syncope Updated Branches: refs/heads/2_0_X 119e4edff -> 3be11e82b refs/heads/master e78530485 -> 228bf3ed5
[SYNCOPE-947] improves template management for realms + fixes some minor l&f issues Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3be11e82 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3be11e82 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3be11e82 Branch: refs/heads/2_0_X Commit: 3be11e82b3ed9fc83ed5e274e6ee25b364e87edf Parents: 119e4ed Author: fmartelli <fabio.marte...@gmail.com> Authored: Mon Sep 19 16:53:25 2016 +0200 Committer: fmartelli <fabio.marte...@gmail.com> Committed: Mon Sep 19 16:53:25 2016 +0200 ---------------------------------------------------------------------- .../console/wizards/any/AnyObjectTemplateWizardBuilder.java | 2 +- .../client/console/wizards/any/GroupTemplateWizardBuilder.java | 2 +- .../org/apache/syncope/client/console/wizards/any/Groups.java | 6 ++++-- .../client/console/wizards/any/UserTemplateWizardBuilder.java | 2 +- .../main/resources/META-INF/resources/css/syncopeConsole.css | 5 +++++ .../syncope/client/console/wizards/any/ConnObjectPanel.html | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/3be11e82/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java index 239a503..141aa9d 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java @@ -48,7 +48,7 @@ public class AnyObjectTemplateWizardBuilder extends AnyObjectWizardBuilder AnyObjectTO anyObjectTO = new AnyObjectTO(); anyObjectTO.setType(anyType); if (templatable instanceof RealmTO) { - anyObjectTO.setRealm(RealmTO.class.cast(templatable).getFullPath()); + anyObjectTO.setRealm(String.format("'%s'", RealmTO.class.cast(templatable).getFullPath())); } setItem(new AnyWrapper<>(anyObjectTO)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3be11e82/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java index 13f0698..d9199fe 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java @@ -46,7 +46,7 @@ public class GroupTemplateWizardBuilder extends GroupWizardBuilder implements Te } else { GroupTO groupTO = new GroupTO(); if (templatable instanceof RealmTO) { - groupTO.setRealm(RealmTO.class.cast(templatable).getFullPath()); + groupTO.setRealm(String.format("'%s'", RealmTO.class.cast(templatable).getFullPath())); } setItem(new GroupWrapper(groupTO)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3be11e82/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java index 39f9b9b..8181baf 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java @@ -59,6 +59,8 @@ public class Groups extends WizardStep implements ICondition { public <T extends AnyTO> Groups(final T anyTO, final boolean templateMode) { super(); + final String realm = templateMode ? "/" : anyTO.getRealm(); + // ----------------------------------------------------------------- // Pre-Authorizations // ----------------------------------------------------------------- @@ -110,7 +112,7 @@ public class Groups extends WizardStep implements ICondition { public List<MembershipTO> execute(final String filter) { return CollectionUtils.collect( groupRestClient.search( - anyTO.getRealm(), + realm, SyncopeClient.getGroupSearchConditionBuilder(). isAssignable().and().is("name").equalTo(filter).query(), -1, -1, @@ -129,7 +131,7 @@ public class Groups extends WizardStep implements ICondition { }).hideLabel().setOutputMarkupId(true)); allGroups = groupRestClient.search( - templateMode ? "/" : anyTO.getRealm(), null, -1, -1, new SortParam<>("name", true), null); + templateMode ? "/" : realm, null, -1, -1, new SortParam<>("name", true), null); final Map<String, GroupTO> allGroupsByKey = new LinkedHashMap<>(allGroups.size()); for (GroupTO group : allGroups) { http://git-wip-us.apache.org/repos/asf/syncope/blob/3be11e82/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java index 9873e35..f2f1477 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java @@ -46,7 +46,7 @@ public class UserTemplateWizardBuilder extends UserWizardBuilder implements Temp } else { UserTO userTO = new UserTO(); if (templatable instanceof RealmTO) { - userTO.setRealm(RealmTO.class.cast(templatable).getFullPath()); + userTO.setRealm(String.format("'%s'", RealmTO.class.cast(templatable).getFullPath())); } setItem(new UserWrapper(userTO)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3be11e82/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 e55578f..9aa9714 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 @@ -624,6 +624,11 @@ START - Result page width: 50%; } +.right { + float:right; + width: 50%; +} + span.highlight .attribute label { color : red; } http://git-wip-us.apache.org/repos/asf/syncope/blob/3be11e82/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html index d517cd1..18a4448 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.html @@ -25,7 +25,7 @@ under the License. <div class="left attribute"> <span wicket:id="oldAttribute">[ATTIRIBUTE]</span> </div> - <div class="attribute"> + <div class="right attribute"> <span wicket:id="newAttribute">[ATTIRIBUTE]</span> </div> </wicket:fragment>