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 2012/10/29 13:49:35 UTC
svn commit: r1403272 [2/2] - in /incubator/syncope/trunk:
client/src/main/java/org/apache/syncope/client/mod/
client/src/main/java/org/apache/syncope/client/util/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/...
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java Mon Oct 29 12:49:32 2012
@@ -52,23 +52,12 @@ public class RoleRestClient extends Abst
return roles;
}
- /**
- * Create new role.
- *
- * @param roleTO
- */
- public void createRole(RoleTO roleTO) {
+ public void create(final RoleTO roleTO) {
SyncopeSession.get().getRestTemplate().postForObject(
baseURL + "role/create", roleTO, RoleTO.class);
}
- /**
- * Load an already existent role by its name.
- *
- * @param name (e.g.:surname)
- * @return schemaTO
- */
- public RoleTO readRole(Long id) {
+ public RoleTO read(final Long id) {
RoleTO roleTO = null;
try {
@@ -80,24 +69,12 @@ public class RoleRestClient extends Abst
return roleTO;
}
- /**
- * Update an already existent role.
- *
- * @param roleTO updated
- * @return true is the operation ends successfully, false otherwise
- */
- public void updateRole(RoleMod roleMod) {
+ public void update(final RoleMod roleMod) {
SyncopeSession.get().getRestTemplate().postForObject(
baseURL + "role/update", roleMod, RoleTO.class);
}
- /**
- * Delete an already existent role by its id.
- *
- * @param name (e.g.:rolename)
- * @return roleTO
- */
- public RoleTO deleteRole(Long id) {
+ public RoleTO delete(final Long id) {
return SyncopeSession.get().getRestTemplate().getForObject(
baseURL + "role/delete/{roleId}.json", RoleTO.class, id);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java Mon Oct 29 12:49:32 2012
@@ -26,8 +26,8 @@ import org.apache.syncope.client.to.Conn
import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.SyncopeSession;
-import org.springframework.stereotype.Component;
import org.apache.syncope.console.commons.StatusBean;
+import org.springframework.stereotype.Component;
/**
* Console client for invoking rest users services.
@@ -51,24 +51,12 @@ public class UserRestClient extends Abst
baseURL + "user/list/{page}/{size}.json", UserTO[].class, page, size));
}
- /**
- * Create a new user and start off the workflow.
- *
- * @param userTO instance
- * @throws SyncopeClientCompositeErrorException
- */
public UserTO create(final UserTO userTO)
throws SyncopeClientCompositeErrorException {
return SyncopeSession.get().getRestTemplate().postForObject(baseURL + "user/create", userTO, UserTO.class);
}
- /**
- * Update existing user.
- *
- * @param userTO
- * @return true is the operation ends successfully, false otherwise
- */
public UserTO update(UserMod userModTO)
throws SyncopeClientCompositeErrorException {
@@ -97,12 +85,6 @@ public class UserRestClient extends Abst
baseURL + "user/search/count.json", searchCond, Integer.class);
}
- /**
- * Search an user by its schema values.
- *
- * @param userTO
- * @return UserTOs
- */
public List<UserTO> search(final NodeCond searchCond)
throws SyncopeClientCompositeErrorException {
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java Mon Oct 29 12:49:32 2012
@@ -35,6 +35,7 @@ public abstract class ActionLink impleme
EXECUTE,
DRYRUN,
CLAIM,
+ SELECT,
EXPORT
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java Mon Oct 29 12:49:32 2012
@@ -18,6 +18,8 @@
*/
package org.apache.syncope.console.wicket.markup.html.form;
+import org.apache.syncope.console.commons.XMLRolesReader;
+import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
@@ -25,12 +27,9 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.syncope.console.commons.XMLRolesReader;
-import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
/**
- * This empty class must exist because there not seems to be alternative to
- * provide specialized HTML for edit links.
+ * This empty class must exist because there not seems to be alternative to provide specialized HTML for edit links.
*/
public class ActionLinksPanel extends Panel {
@@ -53,10 +52,12 @@ public class ActionLinksPanel extends Pa
super.add(new Fragment("panelDelete", "emptyFragment", this));
super.add(new Fragment("panelExecute", "emptyFragment", this));
super.add(new Fragment("panelDryRun", "emptyFragment", this));
+ super.add(new Fragment("panelSelect", "emptyFragment", this));
super.add(new Fragment("panelExport", "emptyFragment", this));
}
- public void add(final ActionLink link, final ActionLink.ActionType type, final String pageId, final String actionId) {
+ public void add(final ActionLink link, final ActionLink.ActionType type, final String pageId,
+ final String actionId) {
add(link, type, xmlRolesReader.getAllAllowedRoles(pageId, actionId), true);
}
@@ -68,15 +69,16 @@ public class ActionLinksPanel extends Pa
}
public void add(final ActionLink link, final ActionLink.ActionType type, final String roles) {
-
add(link, type, roles, true);
}
- public void add(final ActionLink link, final ActionLink.ActionType type, final String roles, final boolean enabled) {
+ public void add(final ActionLink link, final ActionLink.ActionType type, final String roles,
+ final boolean enabled) {
Fragment fragment = null;
switch (type) {
+
case CLAIM:
fragment = new Fragment("panelClaim", "fragmentClaim", this);
@@ -86,11 +88,11 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
-
link.onClick(target);
}
});
break;
+
case CREATE:
fragment = new Fragment("panelCreate", "fragmentCreate", this);
@@ -100,7 +102,6 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
-
link.onClick(target);
}
});
@@ -115,11 +116,11 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
-
link.onClick(target);
}
});
break;
+
case TEMPLATE:
fragment = new Fragment("panelTemplate", "fragmentTemplate", this);
@@ -129,11 +130,11 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
-
link.onClick(target);
}
});
break;
+
case SEARCH:
fragment = new Fragment("panelSearch", "fragmentSearch", this);
@@ -143,11 +144,11 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
-
link.onClick(target);
}
});
break;
+
case EXECUTE:
fragment = new Fragment("panelExecute", "fragmentExecute", this);
@@ -157,11 +158,11 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
-
link.onClick(target);
}
});
break;
+
case DRYRUN:
fragment = new Fragment("panelDryRun", "fragmentDryRun", this);
@@ -171,11 +172,11 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
-
link.onClick(target);
}
});
break;
+
case DELETE:
fragment = new Fragment("panelDelete", "fragmentDelete", this);
@@ -185,12 +186,27 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
+ link.onClick(target);
+ }
+ });
+
+ break;
+ case SELECT:
+ fragment = new Fragment("panelSelect", "fragmentSelect", this);
+
+ fragment.addOrReplace(new IndicatingAjaxLink("selectLink") {
+
+ private static final long serialVersionUID = -7978723352517770644L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
link.onClick(target);
}
});
break;
+
case EXPORT:
fragment = new Fragment("panelExport", "fragmentExport", this);
@@ -200,13 +216,13 @@ public class ActionLinksPanel extends Pa
@Override
public void onClick(final AjaxRequestTarget target) {
-
link.onClick(target);
}
});
break;
+
default:
- // do nothink
+ // do nothink
}
if (fragment != null) {
@@ -216,7 +232,7 @@ public class ActionLinksPanel extends Pa
}
}
- public void remove(ActionLink.ActionType type) {
+ public void remove(final ActionLink.ActionType type) {
switch (type) {
case CLAIM:
super.addOrReplace(new Fragment("panelClaim", "emptyFragment", this));
@@ -229,26 +245,37 @@ public class ActionLinksPanel extends Pa
case EDIT:
super.addOrReplace(new Fragment("panelEdit", "emptyFragment", this));
break;
+
case TEMPLATE:
super.addOrReplace(new Fragment("panelTemplate", "emptyFragment", this));
break;
+
case SEARCH:
super.addOrReplace(new Fragment("panelSearch", "emptyFragment", this));
break;
+
case EXECUTE:
super.addOrReplace(new Fragment("panelExecute", "emptyFragment", this));
break;
+
case DRYRUN:
super.addOrReplace(new Fragment("panelDryRun", "emptyFragment", this));
break;
+
case DELETE:
super.addOrReplace(new Fragment("panelDelete", "emptyFragment", this));
break;
+
+ case SELECT:
+ super.addOrReplace(new Fragment("panelSelect", "emptyFragment", this));
+ break;
+
case EXPORT:
super.addOrReplace(new Fragment("panelExport", "emptyFragment", this));
break;
+
default:
- // do nothink
+ // do nothing
}
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java Mon Oct 29 12:49:32 2012
@@ -107,7 +107,7 @@ public class TreeActionLinkPanel extends
@Override
public Page createPage() {
- RoleTO roleTO = restClient.readRole(idRole);
+ RoleTO roleTO = restClient.read(idRole);
RoleModalPage form = new RoleModalPage(callerPageRef, window, roleTO);
return form;
}
@@ -127,7 +127,7 @@ public class TreeActionLinkPanel extends
@Override
public void onClick(final AjaxRequestTarget target) {
try {
- restClient.deleteRole(idRole);
+ restClient.delete(idRole);
getSession().info(getString("operation_succeded"));
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While deleting role " + idRole, e);
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html Mon Oct 29 12:49:32 2012
@@ -13,50 +13,51 @@
under the License.
-->
<wicket:head>
- <style type="text/css">
- #tabs-2 table{
- font-size: 1.1em;
- }
- #tabs-3 table{
- font-size: 1.1em;
- }
- #tabs-4 table{
- font-size: 1.1em;
- }
- #tabs-5 table{
- font-size: 1.1em;
- }
- #tabs-6 table{
- font-size: 1.1em;
- }
- </style>
+ <style type="text/css">
+ #tabs-2 table{
+ font-size: 1.1em;
+ }
+ #tabs-3 table{
+ font-size: 1.1em;
+ }
+ #tabs-4 table{
+ font-size: 1.1em;
+ }
+ #tabs-5 table{
+ font-size: 1.1em;
+ }
+ #tabs-6 table{
+ font-size: 1.1em;
+ }
+ </style>
</wicket:head>
<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">
- <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>
- </ul>
- <div wicket:id="attributesPanel"></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>
+ <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">
+ <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 wicket:id="rolePanel"/>
+ </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>
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.properties?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.properties Mon Oct 29 12:49:32 2012
@@ -16,12 +16,13 @@
# under the License.
required_alert=All form fields are required.
title=Role
-tab1=Attributes
-tab2=Derived attributes
-tab3=Virtual attributes
-tab4=Resources
-tab5=Entitlements
-tab6=Security
+tab1=Details
+tab2=Attributes
+tab3=Derived attributes
+tab4=Virtual attributes
+tab5=Resources
+tab6=Entitlements
+tab7=Security
add=+
drop=-
error=Generic error occurred during the operation
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage_it.properties?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage_it.properties Mon Oct 29 12:49:32 2012
@@ -16,12 +16,13 @@
# under the License.
required_alert=All form fields are required.
title=Ruolo
-tab1=Attributi
-tab2=Attributi derivati
-tab3=Attributi virtuali
-tab4=Risorse
-tab5=Entitlement
-tab6=Sicurezza
+tab1=Dettagli
+tab2=Attributi
+tab3=Attributi derivati
+tab4=Attributi virtuali
+tab5=Risorse
+tab6=Entitlement
+tab7=Sicurezza
add=+
drop=-
error=Errore generico durante l'operazione
Added: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.html?rev=1403272&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.html (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.html Mon Oct 29 12:49:32 2012
@@ -0,0 +1,18 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ under the License.
+-->
+<wicket:extend>
+ <div wicket:id="treeTable"
+ style="width: 100%;display:block;margin:auto;" class="role-tree"/>
+</wicket:extend>
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html Mon Oct 29 12:49:32 2012
@@ -98,7 +98,7 @@
</div>
<div id="tabs-6">
- <span wicket:id="roles">[roles]</span>
+ <span wicket:id="memberships">[memberships]</span>
</div>
</div>
@@ -124,4 +124,4 @@
<span wicket:id="userModalPageResult"/>
</wicket:fragment>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
Added: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.html?rev=1403272&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.html (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.html Mon Oct 29 12:49:32 2012
@@ -0,0 +1,30 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ under the License.
+-->
+<wicket:extend>
+ <form wicket:id="searchForm">
+ <h2><wicket:message key="search_title"/></h2>
+
+ <span wicket:id="searchPanel">searchPanel</span>
+
+ <input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="search"/>
+ </form>
+
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <img src="img/search.png" alt="search"/>
+ <h2 stile="display:inline;"><wicket:message key="search_results_title"/></h2>
+ <span wicket:id="searchResult"> [search result] </span>
+ </div>
+</wicket:extend>
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.properties?rev=1403272&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.properties Mon Oct 29 12:49:32 2012
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+search=Search
+search_title=Set criteria for user search
+search_error=Error:search's format is invalid
+search_results_title=Search results:
+search_noResults=No matches found.
+reset=Reset
+showingFrom=Showing
+showingTo=to
+showingOf=of
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Added: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage_it.properties?rev=1403272&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage_it.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage_it.properties Mon Oct 29 12:49:32 2012
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+search=Cerca
+search_title=Impostare i criteri di ricerca
+search_error=Errore:il formato di ricerca non \u00e8 valido
+search_results_title=Risultati ricerca:
+search_noResults=Nessuna corrispondenza trovata.
+reset=Reset
+showingFrom=Risultati da
+showingTo=a
+showingOf=di
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage_it.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage_it.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Added: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.properties?rev=1403272&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.properties Mon Oct 29 12:49:32 2012
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+id=Role Id
+name=Role Name
+edit=Edit
+delete=Delete
+
+membership_availability=Roles available
+membership_text=Selected roles
\ No newline at end of file
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Added: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html?rev=1403272&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html Mon Oct 29 12:49:32 2012
@@ -0,0 +1,64 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ under the License.
+-->
+<html>
+ <wicket:panel>
+ <div id="formtable">
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="name"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="name" />
+ </div>
+ </div>
+
+ <div wicket:id="ownerContainer">
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="userOwner"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="userOwner"/>
+ <a href="#" wicket:id="userOwnerSelect"><img src="img/actions/search.png" alt="select user owner" title="Search"/></a>
+ <a href="#" wicket:id="userOwnerReset"><img src="img/actions/delete.png" alt="reset user owner" title="Delete"/></a>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="roleOwner"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="roleOwner"/>
+ <a href="#" wicket:id="roleOwnerSelect"><img src="img/actions/search.png" alt="select role owner" title="Search"/></a>
+ <a href="#" wicket:id="roleOwnerReset"><img src="img/actions/delete.png" alt="reset role owner" title="Delete"/></a>
+ </div>
+ </div>
+ </div>
+
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="inheritOwner"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="inheritOwner" />
+ </div>
+ </div>
+ </div>
+
+ <span wicket:id="userOwnerSelectWin"/>
+ <span wicket:id="roleOwnerSelectWin"/>
+ </wicket:panel>
+</html>
\ No newline at end of file
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.properties?rev=1403272&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.properties Mon Oct 29 12:49:32 2012
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Name
+userOwner=Owner (user)
+roleOwner=Owner (role)
+inheritOwner=Inherit owner
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Added: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_it.properties?rev=1403272&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_it.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_it.properties Mon Oct 29 12:49:32 2012
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Nome
+userOwner=Proprietario (utente)
+roleOwner=Proprietario (ruolo)
+inheritOwner=Eredita proprietario
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_it.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_it.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Copied: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html (from r1402405, incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleAttributesPanel.html)
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html?p2=incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html&p1=incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleAttributesPanel.html&r1=1402405&r2=1403272&rev=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleAttributesPanel.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html Mon Oct 29 12:49:32 2012
@@ -1,63 +1,75 @@
<!--
-Copyright 2011 marco.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ under the License.
-->
<wicket:panel>
- <div id="tabs-1">
- <div id="formtable">
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <wicket:message key="name"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="name">[name]</span>
- </div>
- </div>
-
- <span wicket:id="attributes">[role attributes]</span>
-
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="inheritAttributes"><wicket:message key="inheritAttributes"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="inheritAttributes">[inheritAttributes]</span>
- </div>
- </div>
+ <div id="tabs-1">
+ <span wicket:id="details">[role details]</span>
+ </div>
+
+ <div id="tabs-2">
+ <div id="formtable">
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="inheritAttributes"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="inheritAttributes" />
</div>
+ </div>
</div>
- <div id="tabs-2">
- <span wicket:id="derivedAttributes">[role derived attributes]</span>
- <label for="inheritDerivedAttributes"><wicket:message key="inheritDerivedAttributes"/></label>
- <span wicket:id="inheritDerivedAttributes">[inheritDerivedAttributes]</span>
- </div>
+ <span wicket:id="attributes">[role attributes]</span>
+ </div>
- <div id="tabs-3">
- <span wicket:id="virtualAttributes">[role virtual attributes]</span>
- <label for="inheritVirtualAttributes"><wicket:message key="inheritVirtualAttributes"/></label>
- <span wicket:id="inheritVirtualAttributes">[inheritVirtualAttributes]</span>
+ <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>
- <div id="tabs-4">
- <span wicket:id="resources">[resources]</span>
- </div>
- <div id="tabs-5">
- <span wicket:id="entitlementsPalette">[entitlements]</span>
- </div>
- <div id="tabs-6">
- <span wicket:id="security">[security]</span>
+ <span wicket:id="derivedAttributes">[role derived attributes]</span>
+ </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>
+ </div>
</div>
+
+ <span wicket:id="virtualAttributes">[role virtual attributes]</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>
Copied: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel_it.properties (from r1402405, incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleAttributesPanel_it.properties)
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel_it.properties?p2=incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel_it.properties&p1=incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleAttributesPanel_it.properties&r1=1402405&r2=1403272&rev=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleAttributesPanel_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel_it.properties Mon Oct 29 12:49:32 2012
@@ -38,15 +38,15 @@ addAttributeBtn=Aggiungi
inheritAttributes=Eredita attributi
inheritDerivedAttributes=Eredita attributi derivati
inheritVirtualAttributes=Eredita attributi virtuali
-required_alert=All form fields are required.
+required_alert=Tutti i valori sono richiesti.
add=+
drop=-
name=Nome
error=Errore generico durante l'operazione
firstResourcesList=Risorse ruolo
secondResourcesList=Risorse disponibili
-firstResourcesList=Entitlement ruolo
-secondResourcesList=Entitlement disponibili
+firstResourcesList=Risorse ruolo
+secondResourcesList=Risorse disponibili
derivedAttributes=Attributi derivati
derivedAttributeToBeRemoved=Rimuovi
derivedAttributeName=Nome
@@ -62,3 +62,5 @@ addAttributeBtn=Aggiungi
inheritAttributes=Eredita attributi
inheritDerivedAttributes=Eredita attributi derivati
inheritVirtualAttributes=Eredita attributi virtuali
+firstEntitlementsList=Entitlement ruolo
+secondEntitlementsList=Entitlement disponibili
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html Mon Oct 29 12:49:32 2012
@@ -30,10 +30,11 @@
<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>
+ <li><a href="#tabs-8"><span><wicket:message key="tab8"/></span></a></li>
</ul>
- <div wicket:id="attributesPanel">
+ <div wicket:id="rolePanel">
</div>
- <div id="tabs-7">
+ <div id="tabs-8">
<div wicket:id="userListContainer">
<input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
wicket:id="search"/>
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.properties?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.properties Mon Oct 29 12:49:32 2012
@@ -15,11 +15,12 @@
# specific language governing permissions and limitations
# under the License.
title=Role
-tab1=Attributes
-tab2=Derived attributes
-tab3=Virtual attributes
-tab4=Resources
-tab5=Entitlements
-tab6=Security
-tab7=Users
-search=Get Users
\ No newline at end of file
+tab1=Details
+tab2=Attributes
+tab3=Derived attributes
+tab4=Virtual attributes
+tab5=Resources
+tab6=Entitlements
+tab7=Security
+tab8=Users
+search=Get Users
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel_it.properties?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel_it.properties Mon Oct 29 12:49:32 2012
@@ -15,11 +15,12 @@
# specific language governing permissions and limitations
# under the License.
title=Ruolo
-tab1=Attributi
-tab2=Attributi derivati
-tab3=Attributi virtuali
-tab4=Risorse
-tab5=Entitlement
-tab6=Sicurezza
-tab7=Utenti
+tab1=Dettagli
+tab2=Attributi
+tab3=Attributi derivati
+tab4=Attributi virtuali
+tab5=Risorse
+tab6=Entitlement
+tab7=Sicurezza
+tab8=Utenti
search=Lista Utenti
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html Mon Oct 29 12:49:32 2012
@@ -30,6 +30,7 @@
<span id="action" wicket:id="panelEdit">[plus]</span>
<span id="action" wicket:id="panelExport">[plus]</span>
<span id="action" wicket:id="panelDelete">[plus]</span>
+ <span id="action" wicket:id="panelSelect">[plus]</span>
<wicket:fragment wicket:id="fragmentClaim">
<a href="#" wicket:id="claimLink"><img src="img/actions/claim.png" alt="claim icon" title="Claim"/></a>
@@ -63,6 +64,10 @@
<a href="#" wicket:id="executeLink"><img src="img/actions/execute.png" alt="execute icon" title="Execute"/></a>
</wicket:fragment>
+ <wicket:fragment wicket:id="fragmentSelect">
+ <a href="#" wicket:id="selectLink"><img src="img/actions/select.png" alt="select icon" title="Select"/></a>
+ </wicket:fragment>
+
<wicket:fragment wicket:id="fragmentExport">
<a href="#" wicket:id="exportLink"><img src="img/actions/export.png" alt="export icon" title="Export"/></a>
</wicket:fragment>
Added: incubator/syncope/trunk/console/src/main/webapp/img/actions/select.png
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/webapp/img/actions/select.png?rev=1403272&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/syncope/trunk/console/src/main/webapp/img/actions/select.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java (original)
+++ incubator/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java Mon Oct 29 12:49:32 2012
@@ -106,12 +106,12 @@ public class RoleTestITCase extends Abst
selenium.click("//div[3]/span/div/div/table[3]/tbody/tr/td[4]/table/tbody/tr/td[2]/a");
- selenium.waitForCondition("selenium.isElementPresent(\"//div/form/div[2]/ul/li[6]/a\");", "30000");
+ selenium.waitForCondition("selenium.isElementPresent(\"//div/form/div[2]/ul/li[7]/a\");", "30000");
- selenium.click("//div/form/div[2]/ul/li[6]/a");
+ selenium.click("//div/form/div[2]/ul/li[7]/a");
selenium.waitForCondition("selenium.isElementPresent("
- + "\"//form/div[2]/div/div[6]/span/div/div[2]/div/label\");", "30000");
+ + "\"//form/div[2]/div/div[7]/span/div/div[2]/div/label\");", "30000");
}
@Test
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java?rev=1403272&r1=1403271&r2=1403272&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java Mon Oct 29 12:49:32 2012
@@ -243,6 +243,13 @@ public class RoleDataBinder extends Abst
roleTO.setParent(role.getParent().getId());
}
+ if (role.getUserOwner() != null) {
+ roleTO.setUserOwner(role.getUserOwner().getId());
+ }
+ if (role.getRoleOwner() != null) {
+ roleTO.setRoleOwner(role.getRoleOwner().getId());
+ }
+
// -------------------------
// Retrieve all [derived/virtual] attributes (inherited and not)
// -------------------------