Author: hansbak
Date: Sat Aug 27 06:44:44 2011
New Revision: 1162302
URL: http://svn.apache.org/viewvc?rev=1162302&view=rev
Log:
party preferences assumed preferences by party, is however by userlogin.
screens corrected
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
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=1162302&r1=1162301&r2=1162302&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat
Aug 27 06:44:44 2011
@@ -1137,9 +1137,9 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="Preferences"/>
</request-map>
- <request-map uri="updatePreference">
+ <request-map uri="removePreference">
<security https="true" auth="true"/>
- <event type="service" invoke="setUserPreference"/>
+ <event type="service" invoke="removeUserPreference"/>
<response name="success" type="view" value="Preferences"/>
<response name="error" type="view" value="Preferences"/>
</request-map>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1162302&r1=1162301&r2=1162302&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Aug 27
06:44:44 2011
@@ -1025,7 +1025,7 @@ under the License.
<field name="description" title="${uiLabelMap.CommonDescription}"
required-field="true"><text/></field>
<field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
- <form name="ListPreference" type="list" target="updatePreference"
list-name="userPreferenceList"
+ <form name="ListPreference" type="list" target="removePreference"
list-name="userPreferenceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" separate-columns="true" use-row-submit="true" >
<row-actions>
<service service-name="getUserPreference" result-map="values">
@@ -1037,20 +1037,9 @@ under the License.
<field name="enumTypeId" parameter-name="userPrefGroupTypeId"><hidden
value="${enumTypeId}"/></field>
<field name="description"
title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="partyId"><hidden/></field>
- <field name="userPrefValue" title="${uiLabelMap.CommonValue}"
use-when="enumId.equals("ORGANIZATION_PARTY")"
parameter-name="userPrefValue" >
- <drop-down current="selected"
no-current-selected-key="defaultOrganizationPartyId">
- <entity-options entity-name="PartyAcctgPrefAndGroup"
description="${groupName}" key-field-name="partyId"/>
- </drop-down>
- </field>
- <field name="userPrefValue" title="${uiLabelMap.CommonValue}"
use-when="enumId.equals("VISUAL_THEME")"
parameter-name="userPrefValue">
- <drop-down current="selected">
- <entity-options key-field-name="visualThemeId"
description="${visualThemeId} - ${description}" entity-name="VisualTheme">
- <entity-constraint name="visualThemeSetId"
operator="equals" value="BACKOFFICE"/>
- </entity-options>
- </drop-down>
- </field>
-
- <field name="submit"
title="${uiLabelMap.CommonSubmit}"><submit/></field>
+ <field name="userPrefUserLoginId"><hidden/></field>
+ <field name="userPrefValue"
title="${uiLabelMap.CommonValue}"><display></display></field>
+ <field name="submit" title="${uiLabelMap.CommonRemove}"
use-when="userPrefValue!=null"><submit/></field>
</form>
<form name="PartyBillingAccount" type="list" list-name="billingAccounts"
default-table-style="basic-table hover-bar">
<field name="billingAccountId"><display/></field>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1162302&r1=1162301&r2=1162302&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Aug 27
06:44:44 2011
@@ -1102,13 +1102,25 @@ under the License.
<entity-and entity-name="Enumeration"
list="userPreferenceList">
<field-map field-name="enumTypeId"
value="GLOBAL_PREFERENCES"/>
</entity-and>
+ <entity-and entity-name="UserLogin" list="userLogins">
+ <field-map field-name="partyId"
from-field="parameters.partyId"/>
+ </entity-and>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.CommonPreferences}" >
- <include-form name="ListPreference"
location="component://party/widget/partymgr/PartyForms.xml"/>
- </screenlet>
+ <iterate-section entry="userLogin" list="userLogins">
+ <section>
+ <actions>
+ <set field="userPrefUserLoginId"
from-field="userLogin.userLoginId"/>
+ </actions>
+ <widgets>
+ <screenlet
title="${uiLabelMap.CommonPreferences} ${uiLabelMap.CommonFor}
${userPrefUserLoginId}" >
+ <include-form name="ListPreference"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </iterate-section>
</decorator-section>
</decorator-screen>
</widgets>
