syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skylar...@apache.org
Subject syncope git commit: Improvement to Groups wizard step in order to allow panel customization
Date Thu, 02 Aug 2018 15:32:44 GMT
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 5d6efba76 -> 3d757abe4


Improvement to Groups wizard step in order to allow panel customization


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

Branch: refs/heads/2_0_X
Commit: 3d757abe4d30d451f39a026e7c5b50bb16f401d1
Parents: 5d6efba
Author: skylark17 <matteo.alessandroni@tirasa.net>
Authored: Thu Aug 2 17:32:29 2018 +0200
Committer: skylark17 <matteo.alessandroni@tirasa.net>
Committed: Thu Aug 2 17:32:29 2018 +0200

----------------------------------------------------------------------
 .../client/console/wizards/any/Groups.java      | 12 ++++++++++--
 .../client/console/wizards/any/Groups.html      | 20 +++++++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/3d757abe/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 d22a270..e9a9b3e 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
@@ -71,6 +71,10 @@ public class Groups extends WizardStep implements ICondition {
 
     private boolean templateMode;
 
+    protected WebMarkupContainer dyngroupsContainer;
+
+    protected WebMarkupContainer dynrealmsContainer;
+
     public <T extends AnyTO> Groups(final AnyWrapper<T> modelObject, final boolean
templateMode) {
         super();
         this.templateMode = templateMode;
@@ -94,7 +98,7 @@ public class Groups extends WizardStep implements ICondition {
         groupsContainer.setOutputMarkupPlaceholderTag(true);
         add(groupsContainer);
 
-        WebMarkupContainer dyngroupsContainer = new WebMarkupContainer("dyngroupsContainer");
+        dyngroupsContainer = new WebMarkupContainer("dyngroupsContainer");
         dyngroupsContainer.setOutputMarkupId(true);
         dyngroupsContainer.setOutputMarkupPlaceholderTag(true);
         add(dyngroupsContainer);
@@ -195,13 +199,17 @@ public class Groups extends WizardStep implements ICondition {
             // ---------------------------------
         }
 
-        add(new AjaxPalettePanel.Builder<String>().build("dynrealms",
+        dynrealmsContainer = new WebMarkupContainer("dynrealmsContainer");
+        dynrealmsContainer.setOutputMarkupId(true);
+        dynrealmsContainer.setOutputMarkupPlaceholderTag(true);
+        dynrealmsContainer.add(new AjaxPalettePanel.Builder<String>().build("dynrealms",
                 new PropertyModel<List<String>>(anyTO, "dynRealms"),
                 new ListModel<>(
                         CollectionUtils.collect(allDynRealms,
                                 EntityTOUtils.keyTransformer(),
                                 new ArrayList<String>()))).
                 hideLabel().setEnabled(false).setOutputMarkupId(true));
+        add(dynrealmsContainer);
 
         // ------------------
         // insert changed label if needed

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d757abe/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
index 10b6524..4cf95ab 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
@@ -45,15 +45,17 @@ under the License.
       </div>
     </div>
 
-    <div class="col-xs-12">
-      <div class="box">
-        <div class="box-header">
-          <h3 class="box-title">
-            <wicket:message key="dynrealms.palette">[DYNAMIC REALMS]</wicket:message>
-          </h3>
-        </div>
-        <div class="box-body">
-          <span wicket:id="dynrealms">[DYNAMIC GROUPS]</span>
+    <div class="col-xs-12" wicket:id="dynrealmsContainer">
+      <div class="col-xs-12">
+        <div class="box">
+          <div class="box-header">
+            <h3 class="box-title">
+              <wicket:message key="dynrealms.palette">[DYNAMIC REALMS]</wicket:message>
+            </h3>
+          </div>
+          <div class="box-body">
+            <span wicket:id="dynrealms">[DYNAMIC GROUPS]</span>
+          </div>
         </div>
       </div>
     </div>


Mime
View raw message