Author: jacopoc
Date: Tue Feb 20 04:04:52 2007
New Revision: 509524
URL: http://svn.apache.org/viewvc?view=rev&rev=509524
Log:
Applied slightly modified patch from Rashko Rejmer (OFBIZ-700) to improve the
lookup of user logins (I've modified some nemaes of the artifacts used).
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.properties
ofbiz/trunk/applications/party/entitydef/entitygroup.xml
ofbiz/trunk/applications/party/entitydef/entitymodel.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?view=diff&rev=509524&r1=509523&r2=509524
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Tue Feb 20
04:04:52 2007
@@ -309,6 +309,7 @@
PartyLookupPartyByName=Lookup Party by Name
PartyLookupPartyPerson=Lookup Person
PartyLookupPartyAndUserLoginAndPerson=Lookup PartyAndUserLoginAndPerson
+PartyLookupUserLoginAndPartyDetails=Lookup UserLoginAndPartyDetails
PartyLookupPartyGroup=Lookup Group
PartyLookupPartyClassificationGroup=Lookup Party Classification Group
PartyLookupPartyCommEvent=Lookup Communication Event
Modified: ofbiz/trunk/applications/party/entitydef/entitygroup.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitygroup.xml?view=diff&rev=509524&r1=509523&r2=509524
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitygroup.xml Tue Feb 20
04:04:52 2007
@@ -104,6 +104,7 @@
<entity-group group="org.ofbiz" entity="PartyAndPerson" />
<entity-group group="org.ofbiz" entity="PartyAndUserLogin" />
<entity-group group="org.ofbiz" entity="PartyAndUserLoginAndPerson" />
+ <entity-group group="org.ofbiz" entity="UserLoginAndPartyDetails" />
<entity-group group="org.ofbiz" entity="PartyAttribute" />
<entity-group group="org.ofbiz" entity="PartyClassification" />
<entity-group group="org.ofbiz" entity="PartyClassificationGroup" />
Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?view=diff&rev=509524&r1=509523&r2=509524
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Tue Feb 20
04:04:52 2007
@@ -1416,6 +1416,42 @@
<key-map field-name="userLoginId"/>
</relation>
</view-entity>
+ <view-entity entity-name="UserLoginAndPartyDetails"
+ package-name="org.ofbiz.party.party"
+ title="UserLogin, Party, Person and PartyGroup">
+ <member-entity entity-alias="ULN" entity-name="UserLogin"/>
+ <member-entity entity-alias="PTY" entity-name="Party"/>
+ <member-entity entity-alias="PER" entity-name="Person"/>
+ <member-entity entity-alias="PTYGRP" entity-name="PartyGroup"/>
+ <alias entity-alias="PTY" name="partyId"/>
+ <alias entity-alias="PTY" name="partyTypeId"/>
+ <alias entity-alias="PTY" name="createdDate"/>
+ <alias entity-alias="PTYGRP" name="groupName"/>
+ <alias entity-alias="ULN" name="userLoginId"/>
+ <alias entity-alias="ULN" name="currentPassword"/>
+ <alias entity-alias="ULN" name="passwordHint"/>
+ <alias entity-alias="ULN" name="enabled"/>
+ <alias entity-alias="ULN" name="disabledDateTime"/>
+ <alias entity-alias="ULN" name="successiveFailedLogins"/>
+ <alias entity-alias="PER" name="lastName"/>
+ <alias entity-alias="PER" name="middleName"/>
+ <alias entity-alias="PER" name="firstName"/>
+ <view-link entity-alias="ULN" rel-entity-alias="PTY" rel-optional="true">
+ <key-map field-name="partyId"/>
+ </view-link>
+ <view-link entity-alias="ULN" rel-entity-alias="PER" rel-optional="true">
+ <key-map field-name="partyId"/>
+ </view-link>
+ <view-link entity-alias="ULN" rel-entity-alias="PTYGRP"
rel-optional="true">
+ <key-map field-name="partyId"/>
+ </view-link>
+ <relation type="one-nofk" rel-entity-name="Party">
+ <key-map field-name="partyId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="UserLogin">
+ <key-map field-name="userLoginId"/>
+ </relation>
+ </view-entity>
<entity entity-name="PartyAttribute"
package-name="org.ofbiz.party.party"
title="Party Attribute Entity">
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?view=diff&rev=509524&r1=509523&r2=509524
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue
Feb 20 04:04:52 2007
@@ -874,6 +874,7 @@
<request-map uri="LookupPartyName"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupPartyName"/></request-map>
<request-map uri="LookupPerson"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupPerson"/></request-map>
<request-map uri="LookupPartyAndUserLoginAndPerson"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupPartyAndUserLoginAndPerson"/></request-map>
+ <request-map uri="LookupUserLoginAndPartyDetails"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupUserLoginAndPartyDetails"/></request-map>
<request-map uri="LookupPartyGroup"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupPartyGroup"/></request-map>
<request-map uri="LookupPartyClassificationGroup"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupPartyClassificationGroup"/></request-map>
<request-map uri="LookupCommEvent"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupCommEvent"/></request-map>
@@ -958,6 +959,7 @@
<view-map name="LookupPartyClassificationGroup" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyClassificationGroup"/>
<view-map name="LookupPerson" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
<view-map name="LookupPartyAndUserLoginAndPerson" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson"/>
+ <view-map name="LookupUserLoginAndPartyDetails" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/>
<view-map name="LookupPartyGroup" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>
<view-map name="LookupCommEvent" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupCommEvent"/>
<view-map name="LookupWorkEffort" type="screen"
page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml?view=diff&rev=509524&r1=509523&r2=509524
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml Tue
Feb 20 04:04:52 2007
@@ -124,6 +124,39 @@
<field name="lastName" title="${uiLabelMap.PartyName}"><display
description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
</form>
+ <form name="lookupUserLoginAndPartyDetails"
default-title-style="tableheadtext"
+ default-tooltip-style="tabletext" default-widget-style="inputBox"
+ target="LookupUserLoginAndPartyDetails"
paginate-target="LookupUserLoginAndPartyDetails"
+ title="" type="single">
+ <field name="userLoginId"
title="${uiLabelMap.PartyUserLoginId}"><text-find/></field>
+ <field name="partyId"
title="${uiLabelMap.PartyPartyId}"><text-find/></field>
+ <field name="firstName"
title="${uiLabelMap.PartyFirstName}"><text-find/></field>
+ <field name="middleName"
title="${uiLabelMap.PartyMiddleName}"><text-find/></field>
+ <field name="lastName"
title="${uiLabelMap.PartyLastName}"><text-find/></field>
+ <field name="groupName"
title="${uiLabelMap.PartyGroupName}"><text-find/></field>
+ <field name="createdDate"
title="${uiLabelMap.PartyCreatedDate}"><date-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}"
widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="listLookupUserLoginAndPartyDetails"
default-title-style="tableheadtext"
+ default-tooltip-style="tabletext" default-widget-style="tabletext"
+ list-name="listIt" target=""
paginate-target="LookupUserLoginAndPartyDetails" title="" type="list">
+ <actions>
+ <service service-name="performFind" result-map-name="result"
result-map-list-name="listIt">
+ <field-map field-name="inputFields"
env-name="requestParameters"/>
+ <field-map field-name="entityName" env-name="entityName"/>
+ </service>
+ </actions>
+ <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"
widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain"
description="${userLoginId}" target="javascript:set_value('${userLoginId}',
'${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ </field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}">
+ <display description="${partyId}"/>
+ </field>
+ <field name="lastName" title="${uiLabelMap.PartyName}"><display
description="${firstName} ${middleName} ${lastName}"/></field>
+ <field name="groupName"
title="${uiLabelMap.PartyGroupName}"><display
description="${groupName}"/></field>
+ </form>
+
<form name="lookupPartyGroup" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
target="LookupPartyGroup"
title="" type="single">
<!--<auto-fields-entity entity-name="PartyGroup"
default-field-type="find"/>-->
Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?view=diff&rev=509524&r1=509523&r2=509524
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml Tue Feb 20
04:04:52 2007
@@ -97,6 +97,30 @@
</widgets>
</section>
</screen>
+ <screen name="LookupUserLoginAndPartyDetails">
+ <section>
+ <condition>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+ </condition>
+ <actions>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
+
+ <set field="title"
value="${uiLabelMap.PartyLookupUserLoginAndPartyDetails}"/>
+ <set field="entityName" value="UserLoginAndPartyDetails"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <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="body">
+ <include-form name="lookupUserLoginAndPartyDetails"
location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ <include-form
name="listLookupUserLoginAndPartyDetails"
location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="LookupPartyGroup">
<section>
<condition>
Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?view=diff&rev=509524&r1=509523&r2=509524
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Tue Feb 20
04:04:52 2007
@@ -119,7 +119,7 @@
<auto-fields-service service-name="addUserLoginToSecurityGroup"/>
<field name="groupId"><hidden/></field>
- <field name="userLoginId"
title="${uiLabelMap.PartyUserLoginId}"><lookup
target-form-name="LookupPartyAndUserLoginAndPerson" size="30"></lookup></field>
+ <field name="userLoginId"
title="${uiLabelMap.PartyUserLoginId}"><lookup
target-form-name="LookupUserLoginAndPartyDetails" size="30"></lookup></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
