[syncope] branch master updated: Allow for easier extensions of Roles step

[il...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new d06fd3f  Allow for easier extensions of Roles step
d06fd3f is described below

commit d06fd3fd6398746b232f7024fd03c874f524a0f3
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jan 30 16:38:48 2020 +0100

    Allow for easier extensions of Roles step
---
 .../org/apache/syncope/client/console/wizards/any/Roles.java   | 10 +++++++++-
 .../org/apache/syncope/client/console/wizards/any/Roles.html   |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java
index 2c61872..f1fd279 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java
@@ -37,6 +37,7 @@ import org.apache.wicket.authroles.authorization.strategies.role.metadata.Action
 import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
 import org.apache.wicket.extensions.wizard.WizardModel.ICondition;
 import org.apache.wicket.extensions.wizard.WizardStep;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.util.ListModel;
@@ -49,6 +50,8 @@ public class Roles extends WizardStep implements ICondition {
 
     private final List<String> allRoles;
 
+    protected WebMarkupContainer dynrolesContainer;
+
     public <T extends AnyTO> Roles(final AnyWrapper<?> modelObject) {
         if (!(modelObject.getInnerObject() instanceof UserTO)) {
             throw new IllegalStateException("Invalid instance " + modelObject.getInnerObject());
@@ -106,7 +109,12 @@ public class Roles extends WizardStep implements ICondition {
                 hideLabel().
                 setOutputMarkupId(true));
 
-        add(new AjaxPalettePanel.Builder<String>().build("dynroles",
+        dynrolesContainer = new WebMarkupContainer("dynrolesContainer");
+        dynrolesContainer.setOutputMarkupId(true);
+        dynrolesContainer.setOutputMarkupPlaceholderTag(true);
+        add(dynrolesContainer);
+
+        dynrolesContainer.add(new AjaxPalettePanel.Builder<String>().build("dynroles",
                 new PropertyModel<>(entityTO, "dynRoles"),
                 new ListModel<>(allRoles)).hideLabel().setEnabled(false).setOutputMarkupId(true));
     }
diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html
index 5243059..4d2a602 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Roles.html
@@ -32,7 +32,7 @@ under the License.
       </div>
     </div>
 
-    <div class="col-xs-12">
+    <div class="col-xs-12" wicket:id="dynrolesContainer">
       <div class="box">
         <div class="box-header">
           <h3 class="box-title">