You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/04/15 11:43:07 UTC
svn commit: r1467915 - in /syncope/branches/1_1_X/console/src/main:
java/org/apache/syncope/console/pages/panels/
resources/org/apache/syncope/console/pages/
resources/org/apache/syncope/console/pages/panels/
Author: ilgrosso
Date: Mon Apr 15 09:43:06 2013
New Revision: 1467915
URL: http://svn.apache.org/r1467915
Log:
[SYNCOPE-356] Fixed incorrect IModel for resources' AjaxPalettePanel (roles)
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html
Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java?rev=1467915&r1=1467914&r2=1467915&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java (original)
+++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java Mon Apr 15 09:43:06 2013
@@ -89,7 +89,8 @@ public class ResourcesPanel extends Pane
Collections.sort(selectedResources);
final AjaxPalettePanel<String> resourcesPalette = new AjaxPalettePanel<String>("resourcesPalette",
- new ListModel<String>(selectedResources), new ListModel<String>(allResources));
+ new PropertyModel<List<String>>(roleTO, "resources"),
+ new ListModel<String>(allResources));
add(resourcesPalette);
}
@@ -115,8 +116,8 @@ public class ResourcesPanel extends Pane
private static final long serialVersionUID = -3415146226879212841L;
@Override
- protected Recorder newRecorderComponent() {
- Recorder recorder = super.newRecorderComponent();
+ protected Recorder<T> newRecorderComponent() {
+ Recorder<T> recorder = super.newRecorderComponent();
recorder.add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 5538299138211283825L;
Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java?rev=1467915&r1=1467914&r2=1467915&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java (original)
+++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java Mon Apr 15 09:43:06 2013
@@ -51,7 +51,7 @@ public class RolePanel extends Panel {
@SpringBean
private XMLRolesReader xmlRolesReader;
- private final AjaxPalettePanel entitlementsPalette;
+ private final AjaxPalettePanel<String> entitlementsPalette;
public RolePanel(final String id, final Form form, final RoleTO roleTO, final RoleModalPage.Mode mode) {
this(id, form, roleTO, mode, null);
@@ -130,8 +130,8 @@ public class RolePanel extends Panel {
}
ListModel<String> availableEntitlements = new ListModel<String>(allEntitlements);
- entitlementsPalette = new AjaxPalettePanel("entitlementsPalette", selectedEntitlements, availableEntitlements);
-
+ entitlementsPalette =
+ new AjaxPalettePanel<String>("entitlementsPalette", selectedEntitlements, availableEntitlements);
this.add(entitlementsPalette);
}
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html?rev=1467915&r1=1467914&r2=1467915&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html Mon Apr 15 09:43:06 2013
@@ -16,34 +16,36 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:extend>
- <div style="margin:10px">
- <p class="ui-widget ui-corner-all ui-widget-header">
- <wicket:message key="title"/> <span wicket:id="displayName"/>
- </p>
- <form wicket:id="RoleForm">
- <div id="tabs">
- <div style="display: block; clear: both">
- <ul>
- <li><a href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li>
- <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
- <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
- <li><a href="#tabs-4"><span><wicket:message key="tab4"/></span></a></li>
- <li><a href="#tabs-5"><span><wicket:message key="tab5"/></span></a></li>
- <li><a href="#tabs-6"><span><wicket:message key="tab6"/></span></a></li>
- <li><a href="#tabs-7"><span><wicket:message key="tab7"/></span></a></li>
- </ul>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:extend>
+ <div style="margin:10px">
+ <p class="ui-widget ui-corner-all ui-widget-header">
+ <wicket:message key="title"/> <span wicket:id="displayName"/>
+ </p>
+ <form wicket:id="RoleForm">
+ <div id="tabs">
+ <div style="display: block; clear: both">
+ <ul>
+ <li><a href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li>
+ <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
+ <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
+ <li><a href="#tabs-4"><span><wicket:message key="tab4"/></span></a></li>
+ <li><a href="#tabs-5"><span><wicket:message key="tab5"/></span></a></li>
+ <li><a href="#tabs-6"><span><wicket:message key="tab6"/></span></a></li>
+ <li><a href="#tabs-7"><span><wicket:message key="tab7"/></span></a></li>
+ </ul>
+ </div>
+ <div wicket:id="rolePanel"></div>
</div>
- <div wicket:id="rolePanel"></div>
- </div>
- <div style="bottom:0;margin:10px">
- <input type="submit"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="submit"/>
- <input type="button"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="cancel"/>
- </div>
- </form>
- </div>
-</wicket:extend>
+ <div style="bottom:0;margin:10px">
+ <input type="submit"
+ class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="submit"/>
+ <input type="button"
+ class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="cancel"/>
+ </div>
+ </form>
+ </div>
+ </wicket:extend>
+</html>
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html?rev=1467915&r1=1467914&r2=1467915&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html Mon Apr 15 09:43:06 2013
@@ -16,66 +16,68 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:panel>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
- <div id="tabs-1">
- <span wicket:id="details">[role details]</span>
- <span wicket:id="statuspanel">[Status Panel]</span>
- </div>
-
- <div id="tabs-2">
- <div id="formtable">
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <wicket:message key="inheritAttributes"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="inheritAttributes" />
+ <div id="tabs-1">
+ <span wicket:id="details">[role details]</span>
+ <span wicket:id="statuspanel">[Status Panel]</span>
+ </div>
+
+ <div id="tabs-2">
+ <div id="formtable">
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="inheritAttributes"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="inheritAttributes" />
+ </div>
</div>
- </div>
- <span wicket:id="attributes">[role attributes]</span>
+ <span wicket:id="attributes">[role attributes]</span>
+ </div>
</div>
- </div>
- <div id="tabs-3">
- <div id="formtable">
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <wicket:message key="inheritDerivedAttributes"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="inheritDerivedAttributes" />
+ <div id="tabs-3">
+ <div id="formtable">
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="inheritDerivedAttributes"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="inheritDerivedAttributes" />
+ </div>
</div>
- </div>
- <span wicket:id="derivedAttributes">[role derived attributes]</span>
+ <span wicket:id="derivedAttributes">[role derived attributes]</span>
+ </div>
</div>
- </div>
- <div id="tabs-4">
- <div id="formtable">
- <div class="tablerow alt">
- <div class="tablecolumn_label short_dynamicsize">
- <wicket:message key="inheritVirtualAttributes"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="inheritVirtualAttributes" />
+ <div id="tabs-4">
+ <div id="formtable">
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="inheritVirtualAttributes"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="inheritVirtualAttributes" />
+ </div>
</div>
- </div>
- <span wicket:id="virtualAttributes">[role virtual attributes]</span>
+ <span wicket:id="virtualAttributes">[role virtual attributes]</span>
+ </div>
</div>
- </div>
- <div id="tabs-5">
- <span wicket:id="resources">[resources]</span>
- </div>
- <div id="tabs-6">
- <span wicket:id="entitlementsPalette">[entitlements]</span>
- </div>
- <div id="tabs-7">
- <span wicket:id="security">[security]</span>
- </div>
+ <div id="tabs-5">
+ <span wicket:id="resources">[resources]</span>
+ </div>
+ <div id="tabs-6">
+ <span wicket:id="entitlementsPalette">[entitlements]</span>
+ </div>
+ <div id="tabs-7">
+ <span wicket:id="security">[security]</span>
+ </div>
-</wicket:panel>
+ </wicket:panel>
+</html>