You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2010/12/28 06:19:50 UTC
svn commit: r1053259 [1/2] - in /ofbiz/trunk: applications/party/config/
applications/party/webapp/partymgr/WEB-INF/
applications/party/webapp/partymgr/party/profileblocks/
applications/party/widget/partymgr/ framework/common/config/
framework/common/w...
Author: adrianc
Date: Tue Dec 28 05:19:49 2010
New Revision: 1053259
URL: http://svn.apache.org/viewvc?rev=1053259&view=rev
Log:
Finished moving security-related UI artifacts to the common component, plus added a Security UI to the webtools component.
Internationalization note: This commit contains new UI labels.
Added:
ofbiz/trunk/framework/common/webcommon/WEB-INF/security-controller.xml (with props)
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl
ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/framework/common/config/SecurityUiLabels.xml
ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl
ofbiz/trunk/framework/common/widget/LookupForms.xml
ofbiz/trunk/framework/common/widget/LookupScreens.xml
ofbiz/trunk/framework/common/widget/SecurityForms.xml
ofbiz/trunk/framework/common/widget/SecurityMenus.xml
ofbiz/trunk/framework/common/widget/SecurityScreens.xml
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/Menus.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Dec 28 05:19:49 2010
@@ -1986,21 +1986,6 @@
<value xml:lang="zh">ç¼è¾å®å
¨ç»ç¨æ·ç»å½</value>
<value xml:lang="zh_TW">編輯å®å
¨çµç¨æ¶ç»é</value>
</property>
- <property key="PageTitleEditUserLoginSecurityGroups">
- <value xml:lang="de">Sicherheitsgruppen zur Benuterzanmeldung bearbeiten</value>
- <value xml:lang="en">Edit UserLogin Security Groups</value>
- <value xml:lang="es">Editar grupos de seguridad</value>
- <value xml:lang="fr">Modifier les groupes de sécurité de l'identifiant de connexion </value>
- <value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ à¤à¥ सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ à¤à¥ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤</value>
- <value xml:lang="it">Aggiorna Gruppi Sicurezza Utente</value>
- <value xml:lang="nl">Beveiligingsgroepen userlogin wijzigen</value>
- <value xml:lang="pt_BR">Editar usuários/senhas dos grupos de segurança</value>
- <value xml:lang="ro">Actualizare Grup Siguranta Utilizator</value>
- <value xml:lang="ru">ÐзмениÑÑ Ð³ÑÑÐ¿Ð¿Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¸ полÑзоваÑелÑ</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸</value>
- <value xml:lang="zh">ç¼è¾ç¨æ·ç»å½å®å
¨ç»</value>
- <value xml:lang="zh_TW">編輯ç¨æ¶ç»éå®å
¨çµ</value>
- </property>
<property key="PageTitleFindCommunicationEvents">
<value xml:lang="de">Kommunikationen suchen</value>
<value xml:lang="en">Find Communications</value>
@@ -6661,7 +6646,7 @@
</property>
<property key="PartyLookupUserLoginAndPartyDetails">
<value xml:lang="de">Benutzeranmeldung und Akteur suchen</value>
- <value xml:lang="en">Lookup UserLoginAndPartyDetails</value>
+ <value xml:lang="en">Lookup User Login And Party Details</value>
<value xml:lang="es">Buscar conexión y detalles de participante</value>
<value xml:lang="fr">Rechercher un ou des identifiants de connexion et détails de l'acteur</value>
<value xml:lang="hi_IN">à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨/पारà¥à¤à¥à¤µà¤¿à¤µà¤°à¤£ लà¥à¤à¤
प</value>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue Dec 28 05:19:49 2010
@@ -21,6 +21,7 @@ under the License.
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://common/webcommon/WEB-INF/security-controller.xml"/>
<include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<include location="component://content/webapp/content/WEB-INF/controller.xml"/>
<description>Party Manager Module Site Configuration File</description>
@@ -438,133 +439,8 @@ under the License.
<response name="error" type="view" value="EditPartyTaxAuthInfos"/>
</request-map>
- <request-map uri="editlogin"><security https="true" auth="true"/><response name="success" type="view" value="EditUserLogin"/></request-map>
- <request-map uri="updatePassword">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updatePassword"/>
- <response name="success" type="view" value="EditUserLogin"/>
- <response name="error" type="view" value="EditUserLogin"/>
- </request-map>
- <request-map uri="updateUserLoginSecurity">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateUserLoginSecurity"/>
- <response name="success" type="view" value="EditUserLogin"/>
- <response name="error" type="view" value="EditUserLogin"/>
- </request-map>
-
- <request-map uri="EditUserLoginSecurityGroups"><security https="true" auth="true"/><response name="success" type="view" value="EditUserLoginSecurityGroups"/></request-map>
- <request-map uri="userLogin_addUserLoginToSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="addUserLoginToSecurityGroup"/>
- <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
- <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
- </request-map>
- <request-map uri="userLogin_updateUserLoginToSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
- <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
- <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
- </request-map>
- <request-map uri="userLogin_removeUserLoginFromSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
- <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
- <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
- </request-map>
- <request-map uri="EditSecurityGroupProtectedViews"><security https="true" auth="true"/><response name="success" type="view" value="EditSecurityGroupProtectedViews"/></request-map>
- <request-map uri="addProtectedViewToSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="addProtectedViewToSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroupProtectedViews"/>
- <response name="error" type="view" value="EditSecurityGroupProtectedViews"/>
- </request-map>
- <request-map uri="updateProtectedViewToSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateProtectedViewToSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroupProtectedViews"/>
- <response name="error" type="view" value="EditSecurityGroupProtectedViews"/>
- </request-map>
- <request-map uri="removeProtectedViewFromSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="removeProtectedViewFromSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroupProtectedViews"/>
- <response name="error" type="view" value="EditSecurityGroupProtectedViews"/>
- </request-map>
-
- <request-map uri="createnewlogin"><security https="true" auth="true"/><response name="success" type="view" value="createnewlogin"/></request-map>
- <request-map uri="createUserLogin">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createUserLogin"/>
- <response name="success" type="view" value="viewprofile"/>
- <response name="error" type="view" value="createnewlogin"/>
- </request-map>
-
<request-map uri="findparty"><security https="true" auth="true"/><response name="success" type="view" value="findparty"/></request-map>
- <request-map uri="FindSecurityGroup"><security https="true" auth="true"/><response name="success" type="view" value="FindSecurityGroup"/></request-map>
- <request-map uri="EditSecurityGroup"><security https="true" auth="true"/><response name="success" type="view" value="EditSecurityGroup"/></request-map>
- <request-map uri="createSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createSecurityGroup"/>
- <response name="success" type="view" value="FindSecurityGroup"/>
- <response name="error" type="view" value="FindSecurityGroup"/>
- </request-map>
- <request-map uri="updateSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroup"/>
- <response name="error" type="view" value="EditSecurityGroup"/>
- </request-map>
-
- <request-map uri="EditSecurityGroupPermissions"><security https="true" auth="true"/><response name="success" type="view" value="EditSecurityGroupPermissions"/></request-map>
- <request-map uri="addSecurityPermissionToSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="addSecurityPermissionToSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroupPermissions"/>
- <response name="error" type="view" value="EditSecurityGroupPermissions"/>
- </request-map>
- <request-map uri="removeSecurityPermissionFromSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="removeSecurityPermissionFromSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroupPermissions"/>
- <response name="error" type="view" value="EditSecurityGroupPermissions"/>
- </request-map>
-
- <request-map uri="EditSecurityGroupUserLogins"><security https="true" auth="true"/><response name="success" type="view" value="EditSecurityGroupUserLogins"/></request-map>
- <request-map uri="addUserLoginToSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="addUserLoginToSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroupUserLogins"/>
- <response name="error" type="view" value="EditSecurityGroupUserLogins"/>
- </request-map>
- <request-map uri="updateUserLoginToSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroupUserLogins"/>
- <response name="error" type="view" value="EditSecurityGroupUserLogins"/>
- </request-map>
- <request-map uri="removeUserLoginFromSecurityGroup">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
- <response name="success" type="view" value="EditSecurityGroupUserLogins"/>
- <response name="error" type="view" value="EditSecurityGroupUserLogins"/>
- </request-map>
-
- <request-map uri="EditCertIssuerProvisions">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="CertIssuerProvisions"/>
- </request-map>
- <request-map uri="ViewCertificate">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ViewCertificate"/>
- </request-map>
- <request-map uri="importIssuerProvision">
- <security https="true" auth="true"/>
- <event type="service" invoke="importIssuerProvision"/>
- <response name="success" type="view" value="CertIssuerProvisions"/>
- <response name="error" type="view" value="ViewCertificate"/>
- </request-map>
-
<request-map uri="AddPartyNote"><security https="true" auth="true"/><response name="success" type="view" value="AddPartyNote"/></request-map>
<request-map uri="createPartyNote">
<security https="true" auth="true"/>
@@ -1285,6 +1161,57 @@ under the License.
<event type="java" path="org.ofbiz.party.communication.CommunicationEventServices" invoke="markCommunicationAsRead"/>
<response name="success" type="none"/>
</request-map>
+
+ <!-- Profile-specific security requests -->
+ <request-map uri="ProfileCreateNewLogin">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ProfileCreateNewLogin"/>
+ </request-map>
+ <request-map uri="ProfileCreateUserLogin">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createUserLogin"/>
+ <response name="success" type="view" value="ProfileEditUserLogin"/>
+ <response name="error" type="view" value="ProfileCreateNewLogin"/>
+ </request-map>
+ <request-map uri="ProfileEditUserLogin">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ProfileEditUserLogin"/>
+ </request-map>
+ <request-map uri="ProfileUpdatePassword">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updatePassword"/>
+ <response name="success" type="view" value="ProfileEditUserLogin"/>
+ <response name="error" type="view" value="ProfileEditUserLogin"/>
+ </request-map>
+ <request-map uri="ProfileUpdateUserLoginSecurity">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateUserLoginSecurity"/>
+ <response name="success" type="view" value="ProfileEditUserLogin"/>
+ <response name="error" type="view" value="ProfileEditUserLogin"/>
+ </request-map>
+ <request-map uri="ProfileAddUserLoginToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="addUserLoginToSecurityGroup"/>
+ <response name="success" type="view" value="ProfileEditUserLoginSecurityGroups"/>
+ <response name="error" type="view" value="ProfileEditUserLoginSecurityGroups"/>
+ </request-map>
+ <request-map uri="ProfileRemoveUserLoginFromSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
+ <response name="success" type="view" value="ProfileEditUserLoginSecurityGroups"/>
+ <response name="error" type="view" value="ProfileEditUserLoginSecurityGroups"/>
+ </request-map>
+ <request-map uri="ProfileUpdateUserLoginToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
+ <response name="success" type="view" value="ProfileEditUserLoginSecurityGroups"/>
+ <response name="error" type="view" value="ProfileEditUserLoginSecurityGroups"/>
+ </request-map>
+ <request-map uri="ProfileEditUserLoginSecurityGroups">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ProfileEditUserLoginSecurityGroups"/>
+ </request-map>
+
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -1303,12 +1230,15 @@ under the License.
<view-map name="EditPartyTaxAuthInfos" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyTaxAuthInfos"/>
<view-map name="editShoppingList" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#editShoppingList"/>
+ <!-- Party/Profile-specific security view maps -->
+ <view-map name="LookupUserLogin" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/>
+ <view-map name="ProfileEditUserLogin" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditUserLogin"/>
+ <view-map name="ProfileCreateNewLogin" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#CreateUserLogin"/>
+ <view-map name="ProfileEditUserLoginSecurityGroups" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditUserLoginSecurityGroups"/>
+
<view-map name="EditPerson" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPerson"/>
<view-map name="EditPartyGroup" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyGroup"/>
- <view-map name="EditUserLogin" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditUserLogin"/>
- <view-map name="createnewlogin" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#CreateUserLogin"/>
<view-map name="EditPartyAttribute" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyAttribute"/>
- <view-map name="EditUserLoginSecurityGroups" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditUserLoginSecurityGroups"/>
<view-map name="AddPartyNote" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#AddPartyNote"/>
<view-map name="ViewSegmentRoles" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#ViewSegmentRoles"/>
<view-map name="ListPartyContactLists" type="screen" page="component://party/widget/partymgr/PartyContactListScreens.xml#ListPartyContactLists"/>
@@ -1355,14 +1285,6 @@ under the License.
<view-map name="FindPartyClassificationGroups" type="screen" page="component://party/widget/partymgr/PartyClassificationScreens.xml#FindPartyClassificationGroups"/>
<view-map name="EditPartyClassificationGroup" type="screen" page="component://party/widget/partymgr/PartyClassificationScreens.xml#EditPartyClassificationGroup"/>
- <view-map name="FindSecurityGroup" type="screen" page="component://common/widget/SecurityScreens.xml#FindSecurityGroup"/>
- <view-map name="EditSecurityGroup" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroup"/>
- <view-map name="EditSecurityGroupPermissions" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupPermissions"/>
- <view-map name="EditSecurityGroupUserLogins" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupUserLogins"/>
- <view-map name="EditSecurityGroupProtectedViews" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupProtectedViews"/>
- <view-map name="CertIssuerProvisions" type="screen" page="component://common/widget/SecurityScreens.xml#EditX509IssuerProvisions"/>
- <view-map name="ViewCertificate" type="screen" page="component://common/widget/SecurityScreens.xml#ViewCertificate"/>
-
<view-map name="findVisits" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#FindVisits"/>
<view-map name="visitdetail" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#visitdetail"/>
<view-map name="listLoggedInUsers" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#ListLoggedInUsers"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl Tue Dec 28 05:19:49 2010
@@ -22,7 +22,7 @@ under the License.
<ul>
<li class="h3">${uiLabelMap.PartyUserName}</li>
<#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
</#if>
</ul>
<br class="clear" />
@@ -48,10 +48,10 @@ under the License.
</td>
<td class="button-col">
<#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
</#if>
<#if security.hasEntityPermission("SECURITY", "_VIEW", session)>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.SecurityGroups}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.SecurityGroups}</a>
</#if>
</td>
</tr>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Tue Dec 28 05:19:49 2010
@@ -91,7 +91,7 @@ under the License.
<widgets>
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileSubTabBar"/>
<container style="clear"/>
- <container style="h1">
+ <container style="page-title">
<section>
<condition>
<or>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Dec 28 05:19:49 2010
@@ -507,13 +507,23 @@ under the License.
<set field="titleProperty" value="UserLoginUpdateSecuritySettings"/>
<set field="tabButtonItem" value="viewprofile"/>
<set field="labelTitleProperty" value="UserLoginUpdateSecuritySettings"/>
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
+ <set field="updateUserLoginSecurityURI" value="ProfileUpdateUserLoginSecurity"/>
+ <set field="updatePasswordURI" value="ProfileUpdatePassword"/>
+ <set field="cancelPage" from-field="parameters.CANCEL_PAGE" default-value="viewprofile"/>
<set field="partyId" from-field="parameters.partyId"/>
+ <set field="userLoginId" from-field="parameters.userLoginId"/>
+ <entity-one entity-name="UserLogin" value-field="editUserLogin"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-screen name="EditUserLogin" location="component://common/widget/SecurityScreens.xml"/>
+ <container style="page-title">
+ <label text="${uiLabelMap.UserLoginUpdateSecuritySettings} - ${userLoginId}"/>
+ </container>
+ <include-form name="updateUserLoginSecurity" location="component://common/widget/SecurityForms.xml"/>
+ <screenlet title="${uiLabelMap.UserLoginChangePassword}">
+ <include-form name="updatePassword" location="component://common/widget/SecurityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -525,13 +535,16 @@ under the License.
<set field="titleProperty" value="CreateUserLogin"/>
<set field="tabButtonItem" value="viewprofile"/>
<set field="labelTitleProperty" value="CreateUserLogin"/>
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
+ <set field="cancelPage" from-field="parameters.CANCEL_PAGE" default-value="viewprofile"/>
+ <set field="createUserLoginURI" value="ProfileCreateUserLogin"/>
<set field="partyId" from-field="parameters.partyId"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-screen name="CreateUserLogin" location="component://common/widget/SecurityScreens.xml"/>
+ <screenlet title="${uiLabelMap.CreateUserLogin}">
+ <include-form name="AddUserLogin" location="component://common/widget/SecurityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -542,6 +555,10 @@ under the License.
<actions>
<set field="titleProperty" value="PageTitleEditUserLoginSecurityGroups"/>
<set field="tabButtonItem" value="viewprofile"/>
+ <set field="cancelPage" from-field="parameters.CANCEL_PAGE" default-value="viewprofile"/>
+ <set field="addUserLoginSecurityGroupURI" value="ProfileAddUserLoginToSecurityGroup"/>
+ <set field="removeUserLoginSecurityGroupURI" value="ProfileRemoveUserLoginFromSecurityGroup"/>
+ <set field="updateUserLoginSecurityGroupURI" value="ProfileUpdateUserLoginToSecurityGroup"/>
<set field="userLoginId" from-field="parameters.userLoginId"/>
<entity-one entity-name="UserLogin" value-field="editUserLogin"/>
<set field="partyId" from-field="parameters.partyId" default-value="${editUserLogin.partyId}"/>
@@ -550,9 +567,9 @@ under the License.
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet id="AddUserLoginSecurityGroupsPanel" title="${uiLabelMap.AddUserLoginToSecurityGroup}" collapsible="true">
- <include-form name="AddUserLoginSecurityGroup" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ <include-form name="AddUserLoginSecurityGroup" location="component://common/widget/SecurityForms.xml"/>
</screenlet>
- <include-form name="ListUserLoginSecurityGroups" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ <include-form name="ListUserLoginSecurityGroups" location="component://common/widget/SecurityForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Dec 28 05:19:49 2010
@@ -6818,14 +6818,6 @@
<value xml:lang="th">รหัสà¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัย</value>
<value xml:lang="zh">å®å
¨ç»æ è¯</value>
</property>
- <property key="CommonSecurityGroups">
- <value xml:lang="en">Security Groups</value>
- <value xml:lang="fr">Groupes de sécurité</value>
- <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹</value>
- <value xml:lang="it">Gruppo di sicurezza</value>
- <value xml:lang="zh">å®å
¨ç»</value>
- <value xml:lang="zh_TW">å®å
¨çµ</value>
- </property>
<property key="CommonGeoAbbr">
<value xml:lang="en">Abbreviation</value>
<value xml:lang="es">Abreviación</value>
Modified: ofbiz/trunk/framework/common/config/SecurityUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/SecurityUiLabels.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/SecurityUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/SecurityUiLabels.xml Tue Dec 28 05:19:49 2010
@@ -90,6 +90,9 @@
<value xml:lang="zh">ç»ä»¶</value>
<value xml:lang="zh_TW">å
件</value>
</property>
+ <property key="CertDetails">
+ <value xml:lang="en">Cert Details</value>
+ </property>
<property key="CertImportIssuer">
<value xml:lang="de">Aussteller importieren</value>
<value xml:lang="en">Import Issuer</value>
@@ -223,6 +226,9 @@
<value xml:lang="zh">å建ç¨æ·ç»å½</value>
<value xml:lang="zh_TW">建ç«ä½¿ç¨è
ç»å
¥</value>
</property>
+ <property key="FindUserLogin">
+ <value xml:lang="en">Find User Login</value>
+ </property>
<property key="FormFieldTitle_currentPassword">
<value xml:lang="de">Aktuelles Passwort</value>
<value xml:lang="en">Current Password</value>
@@ -355,6 +361,9 @@
<value xml:lang="zh">æµè§å称</value>
<value xml:lang="zh_TW">ç覽å稱</value>
</property>
+ <property key="LookupUserLogin">
+ <value xml:lang="en">Lookup User Login</value>
+ </property>
<property key="NewSecurityGroup">
<value xml:lang="de">Neue Sicherheitsgruppe</value>
<value xml:lang="en">New Security Group</value>
@@ -430,6 +439,21 @@
<value xml:lang="zh">ç¼è¾å®å
¨ç»æé</value>
<value xml:lang="zh_TW">編輯å®å
¨çµæ¬é</value>
</property>
+ <property key="PageTitleEditUserLoginSecurityGroups">
+ <value xml:lang="de">Sicherheitsgruppen zur Benuterzanmeldung bearbeiten</value>
+ <value xml:lang="en">Edit User Login Security Groups</value>
+ <value xml:lang="es">Editar grupos de seguridad</value>
+ <value xml:lang="fr">Modifier les groupes de sécurité de l'identifiant de connexion </value>
+ <value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ à¤à¥ सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ à¤à¥ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤</value>
+ <value xml:lang="it">Aggiorna Gruppi Sicurezza Utente</value>
+ <value xml:lang="nl">Beveiligingsgroepen userlogin wijzigen</value>
+ <value xml:lang="pt_BR">Editar usuários/senhas dos grupos de segurança</value>
+ <value xml:lang="ro">Actualizare Grup Siguranta Utilizator</value>
+ <value xml:lang="ru">ÐзмениÑÑ Ð³ÑÑÐ¿Ð¿Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¸ полÑзоваÑелÑ</value>
+ <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸</value>
+ <value xml:lang="zh">ç¼è¾ç¨æ·ç»å½å®å
¨ç»</value>
+ <value xml:lang="zh_TW">編輯ç¨æ¶ç»éå®å
¨çµ</value>
+ </property>
<property key="PageTitleFindSecurityGroup">
<value xml:lang="de">Sicherheitsgruppe suchen</value>
<value xml:lang="en">Find Security Group</value>
@@ -563,6 +587,9 @@
<value xml:lang="zh">ä¿®æ¹ç¨æ·ç»å½å¯ç </value>
<value xml:lang="zh_TW">ä¿®æ¹ç¨æ¶ç»éå¯ç¢¼</value>
</property>
+ <property key="UserLogin">
+ <value xml:lang="en">User Login</value>
+ </property>
<property key="UserLogins">
<value xml:lang="de">Benutzeranmeldungen</value>
<value xml:lang="en">User Logins</value>
Added: ofbiz/trunk/framework/common/webcommon/WEB-INF/security-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/security-controller.xml?rev=1053259&view=auto
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/security-controller.xml (added)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/security-controller.xml Tue Dec 28 05:19:49 2010
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+ <description>Security Site Configuration File</description>
+
+ <request-map uri="addProtectedViewToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="addProtectedViewToSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroupProtectedViews"/>
+ <response name="error" type="view" value="EditSecurityGroupProtectedViews"/>
+ </request-map>
+ <request-map uri="addSecurityPermissionToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="addSecurityPermissionToSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroupPermissions"/>
+ <response name="error" type="view" value="EditSecurityGroupPermissions"/>
+ </request-map>
+ <request-map uri="addUserLoginToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="addUserLoginToSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroupUserLogins"/>
+ <response name="error" type="view" value="EditSecurityGroupUserLogins"/>
+ </request-map>
+ <request-map uri="createnewlogin">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="createnewlogin" save-current-view="true"/>
+ </request-map>
+ <request-map uri="CreateNewSecurityGroup">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="CreateNewSecurityGroup"/>
+ </request-map>
+ <request-map uri="createSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroup"/>
+ <response name="error" type="view" value="EditSecurityGroup"/>
+ </request-map>
+ <request-map uri="createUserLogin">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createUserLogin"/>
+ <response name="success" type="view" value="EditUserLogin"/>
+ <response name="error" type="view" value="createnewlogin"/>
+ </request-map>
+ <request-map uri="EditCertIssuerProvisions">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="CertIssuerProvisions"/>
+ </request-map>
+ <request-map uri="editlogin">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditUserLogin"/>
+ </request-map>
+ <request-map uri="EditSecurityGroup">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditSecurityGroup"/>
+ </request-map>
+ <request-map uri="EditSecurityGroupPermissions">
+ <security https="true" auth="true" />
+ <response name="success" type="view" value="EditSecurityGroupPermissions" />
+ </request-map>
+ <request-map uri="EditSecurityGroupProtectedViews">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditSecurityGroupProtectedViews"/>
+ </request-map>
+ <request-map uri="EditSecurityGroupUserLogins">
+ <security https="true" auth="true" />
+ <response name="success" type="view" value="EditSecurityGroupUserLogins" />
+ </request-map>
+ <request-map uri="EditUserLoginSecurityGroups">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
+ </request-map>
+ <request-map uri="FindSecurityGroup">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindSecurityGroup"/>
+ </request-map>
+ <request-map uri="FindUserLogin">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindUserLogin"/>
+ </request-map>
+ <request-map uri="importIssuerProvision">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="importIssuerProvision"/>
+ <response name="success" type="view" value="CertIssuerProvisions"/>
+ <response name="error" type="view" value="ViewCertificate"/>
+ </request-map>
+ <request-map uri="LookupUserLogin">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupUserLogin"/>
+ </request-map>
+ <request-map uri="removeProtectedViewFromSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="removeProtectedViewFromSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroupProtectedViews"/>
+ <response name="error" type="view" value="EditSecurityGroupProtectedViews"/>
+ </request-map>
+ <request-map uri="removeSecurityPermissionFromSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="removeSecurityPermissionFromSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroupPermissions"/>
+ <response name="error" type="view" value="EditSecurityGroupPermissions"/>
+ </request-map>
+ <request-map uri="removeUserLoginFromSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroupUserLogins"/>
+ <response name="error" type="view" value="EditSecurityGroupUserLogins"/>
+ </request-map>
+ <request-map uri="updatePassword">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updatePassword"/>
+ <response name="success" type="view" value="EditUserLogin"/>
+ <response name="error" type="view" value="EditUserLogin"/>
+ </request-map>
+ <request-map uri="updateProtectedViewToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateProtectedViewToSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroupProtectedViews"/>
+ <response name="error" type="view" value="EditSecurityGroupProtectedViews"/>
+ </request-map>
+ <request-map uri="updateSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroup"/>
+ <response name="error" type="view" value="EditSecurityGroup"/>
+ </request-map>
+ <request-map uri="updateUserLoginSecurity">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateUserLoginSecurity"/>
+ <response name="success" type="view" value="EditUserLogin"/>
+ <response name="error" type="view" value="EditUserLogin"/>
+ </request-map>
+ <request-map uri="updateUserLoginToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
+ <response name="success" type="view" value="EditSecurityGroupUserLogins"/>
+ <response name="error" type="view" value="EditSecurityGroupUserLogins"/>
+ </request-map>
+ <request-map uri="userLogin_addUserLoginToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="addUserLoginToSecurityGroup"/>
+ <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
+ <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
+ </request-map>
+ <request-map uri="userLogin_removeUserLoginFromSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
+ <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
+ <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
+ </request-map>
+ <request-map uri="userLogin_updateUserLoginToSecurityGroup">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
+ <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
+ <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
+ </request-map>
+ <request-map uri="ViewCertificate">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewCertificate"/>
+ </request-map>
+
+ <view-map name="CertIssuerProvisions" type="screen" page="component://common/widget/SecurityScreens.xml#EditX509IssuerProvisions"/>
+ <view-map name="createnewlogin" type="screen" page="component://common/widget/SecurityScreens.xml#CreateUserLogin"/>
+ <view-map name="CreateNewSecurityGroup" type="screen" page="component://common/widget/SecurityScreens.xml#CreateSecurityGroup"/>
+ <view-map name="EditSecurityGroup" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroup"/>
+ <view-map name="EditSecurityGroupPermissions" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupPermissions"/>
+ <view-map name="EditSecurityGroupProtectedViews" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupProtectedViews"/>
+ <view-map name="EditSecurityGroupUserLogins" type="screen" page="component://common/widget/SecurityScreens.xml#EditSecurityGroupUserLogins"/>
+ <view-map name="EditUserLogin" type="screen" page="component://common/widget/SecurityScreens.xml#EditUserLogin"/>
+ <view-map name="EditUserLoginSecurityGroups" type="screen" page="component://common/widget/SecurityScreens.xml#EditUserLoginSecurityGroups"/>
+ <view-map name="FindSecurityGroup" type="screen" page="component://common/widget/SecurityScreens.xml#FindSecurityGroup"/>
+ <view-map name="FindUserLogin" type="screen" page="component://common/widget/SecurityScreens.xml#FindUserLogin"/>
+ <view-map name="LookupUserLogin" type="screen" page="component://common/widget/LookupScreens.xml#LookupUserLogin"/>
+ <view-map name="ViewCertificate" type="screen" page="component://common/widget/SecurityScreens.xml#ViewCertificate"/>
+
+</site-conf>
Propchange: ofbiz/trunk/framework/common/webcommon/WEB-INF/security-controller.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/common/webcommon/WEB-INF/security-controller.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/framework/common/webcommon/WEB-INF/security-controller.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/ViewCertificate.ftl Tue Dec 28 05:19:49 2010
@@ -21,12 +21,9 @@ under the License.
<#if (requestParameters.certString?has_content)>
<#assign cert = Static["org.ofbiz.base.util.KeyStoreUtil"].pemToCert(requestParameters.certString)/>
</#if>
-<div id="findPartyParameters" class="screenlet">
+<div class="screenlet">
<div class="screenlet-title-bar">
- <ul>
- <li class="h3">${uiLabelMap.PageTitleImportCertificate}</li>
- </ul>
- <br class="clear" />
+ <h3>${uiLabelMap.CertDetails}</h3>
</div>
<div class="screenlet-body">
<#if (cert?has_content)>
@@ -38,12 +35,9 @@ under the License.
</#if>
</div>
</div>
-<div id="findPartyParameters" class="screenlet">
+<div class="screenlet">
<div class="screenlet-title-bar">
- <ul>
- <li class="h3">${uiLabelMap.CertSaveToKeyStore}</li>
- </ul>
- <br class="clear" />
+ <h3>${uiLabelMap.CertSaveToKeyStore}</h3>
</div>
<div class="screenlet-body">
<table cellspacing="0" class="basic-table">
Modified: ofbiz/trunk/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupForms.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupForms.xml Tue Dec 28 05:19:49 2010
@@ -67,4 +67,29 @@ under the License.
</field>
</form>
+ <form name="LookupUserLogin" type="single" target="LookupUserLogin">
+ <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListLookedUpUserLogins" type="list" list-name="listIt" paginate-target="LookupUserLogin"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="orderBy" value="userLoginId"/>
+ <field-map field-name="entityName" value="UserLogin"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
+ <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
+ <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ </field>
+ <field name="enabled"><display/></field>
+ <field name="hasLoggedOut"><display/></field>
+ <field name="disabledDateTime"><display/></field>
+ </form>
+
</forms>
Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Tue Dec 28 05:19:49 2010
@@ -183,4 +183,27 @@ under the License.
</section>
</screen>
+ <screen name="LookupUserLogin">
+ <section>
+ <condition>
+ <if-service-permission service-name="securityPermissionCheck" main-action="VIEW"/>
+ </condition>
+ <actions>
+ <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="title" value="${uiLabelMap.LookupUserLogin}"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="LookupUserLogin" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListLookedUpUserLogins" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/framework/common/widget/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityForms.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/SecurityForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/SecurityForms.xml Tue Dec 28 05:19:49 2010
@@ -58,12 +58,11 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addUserLoginToSecurityGroup"/>
<field name="groupId"><hidden/></field>
- <!-- TODO: Fix lookup screen -->
- <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><lookup target-form-name="LookupUserLoginAndPartyDetails" size="30"></lookup></field>
+ <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><lookup target-form-name="LookupUserLogin" size="30"></lookup></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
- <form name="AddUserLogin" type="single" target="createUserLogin"
+ <form name="AddUserLogin" type="single" target="${createUserLoginURI}"
focus-field-name="userLoginId" header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createUserLogin"/>
<field name="partyId"><hidden/></field>
@@ -77,7 +76,22 @@ under the License.
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="backHome" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ </form>
+
+ <form name="AddUserLoginSecurityGroup" type="single" target="${addUserLoginSecurityGroupURI}"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-service service-name="addUserLoginToSecurityGroup"/>
+ <field name="partyId"><hidden value="${partyId}"/></field>
+ <field name="userLoginId"><hidden/></field>
+ <field name="groupId" title="${uiLabelMap.CommonGroup}">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="SecurityGroup" description="${groupId} ${description}">
+ <entity-order-by field-name="groupId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="CertIssuerList" type="list" list-name="issuerProvisions"
@@ -90,13 +104,15 @@ under the License.
<auto-fields-entity entity-name="X509IssuerProvision" default-field-type="display"/>
</form>
- <form name="EditSecurityGroup" type="single" target="updateSecurityGroup" default-map-name="securityGroup"
- header-row-style="header-row" default-table-style="basic-table">
- <alt-target use-when="securityGroup==null" target="createSecurityGroup"/>
- <auto-fields-service service-name="updateSecurityGroup" map-name="securityGroup"/>
- <field use-when="securityGroup!=null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field use-when="securityGroup==null&&groupId==null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}"><text size="20" maxlength="20"/></field>
- <field use-when="securityGroup==null&&groupId!=null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${groupId}]"><text size="20" maxlength="20"/></field>
+ <form name="CreateSecurityGroup" type="single" target="createSecurityGroup" default-map-name="securityGroup">
+ <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" widget-style="required" tooltip="${uiLabelMap.CommonRequired}"><text size="20" maxlength="20"/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
+ <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ </form>
+
+ <form name="EditSecurityGroup" type="single" target="updateSecurityGroup" default-map-name="securityGroup">
+ <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
@@ -142,7 +158,7 @@ under the License.
</form>
<form name="ListSecurityGroups" type="list" list-name="securityGroups"
- paginate-target="FindSecurityGroup" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ paginate-target="FindSecurityGroup" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="SecurityGroup">
<order-by field-name="groupId"/>
@@ -168,15 +184,6 @@ under the License.
<field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><display/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
- <!--
- <field name="partyId" title="${uiLabelMap.PartyParty}">
- <display-entity entity-name="PartyNameView" also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}">
- <sub-hyperlink target="viewprofile" description="${partyId}" link-style="buttontext">
- <parameter param-name="partyId"/>
- </sub-hyperlink>
- </display-entity>
- </field>
- -->
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonRemove}" target="removeUserLoginFromSecurityGroup" also-hidden="false">
@@ -187,7 +194,81 @@ under the License.
</field>
</form>
- <form name="updatePassword" type="single" target="updatePassword"
+ <form name="ListUserLogins" type="list" list-name="securityGroups"
+ paginate-target="FindUserLogin" header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="UserLogin">
+ <order-by field-name="userLoginId"/>
+ </entity-condition>
+ </actions>
+ <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${userLoginId}" target="editlogin">
+ <parameter param-name="userLoginId"/>
+ </hyperlink>
+ </field>
+ <field name="enabled"><display/></field>
+ <field name="hasLoggedOut"><display/></field>
+ <field name="disabledDateTime"><display/></field>
+ </form>
+
+ <form name="ListUserLoginSecurityGroups" type="list"
+ list-name="userLoginSecurityGroups" header-row-style="header-row-2" target="${updateUserLoginSecurityGroupURI}"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="UserLoginAndSecurityGroup">
+ <condition-expr field-name="userLoginId" from-field="userLoginId"/>
+ <order-by field-name="groupId"/>
+ </entity-condition>
+ </actions>
+ <field name="partyId"><hidden value="${partyId}"/></field>
+ <field name="groupIdCol" title="${uiLabelMap.CommonSecurityGroupId}" widget-style="buttontext">
+ <hyperlink description="${groupId}" target="EditSecurityGroup">
+ <parameter param-name="groupId"/>
+ </hyperlink>
+ </field>
+ <field name="groupId" title="${uiLabelMap.CommonDescription}">
+ <display-entity entity-name="SecurityGroup"/>
+ </field>
+ <field name="userLoginId"><hidden/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="${removeUserLoginSecurityGroupURI}" also-hidden="false">
+ <parameter param-name="partyId"/>
+ <parameter param-name="userLoginId"/>
+ <parameter param-name="groupId"/>
+ <parameter param-name="fromDate"/>
+ </hyperlink>
+ </field>
+ </form>
+
+ <form name="LookupUserLogin" type="single" target="LookupUserLogin">
+ <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListLookedUpUserLogins" type="list" list-name="listIt" paginate-target="LookupUserLogin"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="orderBy" value="userLoginId"/>
+ <field-map field-name="entityName" value="UserLogin"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
+ <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
+ <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ </field>
+ <field name="enabled"><display/></field>
+ <field name="hasLoggedOut"><display/></field>
+ <field name="disabledDateTime"><display/></field>
+ </form>
+
+ <form name="updatePassword" type="single" target="${updatePasswordURI}"
focus-field-name="currentPassword" header-row-style="header-row" default-table-style="basic-table">
<actions>
<set field="passwordHint" from-field="editUserLogin.passwordHint"/>
@@ -200,14 +281,14 @@ under the License.
<field name="newPasswordVerify"><password/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
<parameter param-name="userLoginId"/>
<parameter param-name="partyId"/>
</hyperlink>
</field>
</form>
- <form name="updateUserLoginSecurity" type="single" target="updateUserLoginSecurity" default-map-name="editUserLogin"
+ <form name="updateUserLoginSecurity" type="single" target="${updateUserLoginSecurityURI}" default-map-name="editUserLogin"
header-row-style="header-row" default-table-style="basic-table">
<actions>
<property-to-field field="ldapEnabled" resource="security" property="security.ldap.enable"/>
@@ -219,7 +300,7 @@ under the License.
<field name="userLdapDn" use-when="!"true".equals(ldapEnabled)"><ignored/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
<parameter param-name="userLoginId"/>
<parameter param-name="partyId"/>
</hyperlink>
Modified: ofbiz/trunk/framework/common/widget/SecurityMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityMenus.xml?rev=1053259&r1=1053258&r2=1053259&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/SecurityMenus.xml (original)
+++ ofbiz/trunk/framework/common/widget/SecurityMenus.xml Tue Dec 28 05:19:49 2010
@@ -22,26 +22,63 @@
<menu name="SecurityGroupTabBar" default-menu-item-name="EditSecurityGroup" default-selected-style="selected"
menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="FindUserLogin" title="${uiLabelMap.FindUserLogin}">
+ <link target="FindUserLogin"/>
+ </menu-item>
+ <menu-item name="FindSecurityGroup" title="${uiLabelMap.PageTitleFindSecurityGroup}">
+ <link target="FindSecurityGroup"/>
+ </menu-item>
+ <menu-item name="EditUserLogin" title="${uiLabelMap.UserLogin}">
+ <condition>
+ <not><if-empty field="userLoginId"/></not>
+ </condition>
+ <link target="editlogin">
+ <parameter param-name="userLoginId"/>
+ </link>
+ </menu-item>
<menu-item name="EditSecurityGroup" title="${uiLabelMap.SecurityGroups}">
+ <condition>
+ <not><if-empty field="groupId"/></not>
+ </condition>
<link target="EditSecurityGroup">
<parameter param-name="groupId"/>
</link>
</menu-item>
+ <menu-item name="EditUserLoginSecurityGroups" title="${uiLabelMap.SecurityGroups}">
+ <condition>
+ <not><if-empty field="userLoginId"/></not>
+ </condition>
+ <link target="EditUserLoginSecurityGroups">
+ <parameter param-name="userLoginId"/>
+ </link>
+ </menu-item>
<menu-item name="EditSecurityGroupPermissions" title="${uiLabelMap.Permissions}">
+ <condition>
+ <not><if-empty field="groupId"/></not>
+ </condition>
<link target="EditSecurityGroupPermissions">
<parameter param-name="groupId"/>
</link>
</menu-item>
<menu-item name="EditSecurityGroupUserLogins" title="${uiLabelMap.UserLogins}">
+ <condition>
+ <not><if-empty field="groupId"/></not>
+ </condition>
<link target="EditSecurityGroupUserLogins">
<parameter param-name="groupId"/>
</link>
</menu-item>
<menu-item name="EditSecurityGroupProtectedViews" title="${uiLabelMap.ProtectedViews}">
+ <condition>
+ <not><if-empty field="groupId"/></not>
+ </condition>
<link target="EditSecurityGroupProtectedViews">
<parameter param-name="groupId"/>
</link>
</menu-item>
+ <menu-item name="EditCertIssuerProvisions" title="${uiLabelMap.CertIssuers}">
+ <link target="EditCertIssuerProvisions"/>
+ </menu-item>
</menu>
</menus>