[OFBiz] SVN: r6073 - in trunk/applications/party: config webapp/partymgr/WEB-INF/actions/party webapp/partymgr/party widget/partymgr

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-11-04 18:14:23 -0600 (Fri, 04 Nov 2005)
New Revision: 6073

Modified:
   trunk/applications/party/config/PartyUiLabels.properties
   trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editcontactmech.bsh
   trunk/applications/party/webapp/partymgr/party/PartyForms.xml
   trunk/applications/party/widget/partymgr/PartyScreens.xml
Log:
A few cleanups and fixes; changed editcontactmech.bash to use parameters.get instead of request.getParameter (which we need to do in lots more places); fixed a few problems in the Party SegmentGroup area

Modified: trunk/applications/party/config/PartyUiLabels.properties
===================================================================
--- trunk/applications/party/config/PartyUiLabels.properties	2005-11-04 22:58:51 UTC (rev 6072)
+++ trunk/applications/party/config/PartyUiLabels.properties	2005-11-05 00:14:23 UTC (rev 6073)
@@ -338,7 +338,7 @@
 PartySecurityGroupId=Security Group ID
 PartySecurityGroupsList=SecurityGroups List
 PartySecurityViewPermissionError=PartySecurityViewPermissionError You do not have permission to view this page. ("SECURITY_VIEW" or "SECURITY_ADMIN" needed)
-PartySegmentGroupId=Segment Id
+PartySegmentGroupId=Segment Group Id
 PartySegmentGroupTypeId=Segment Type Id
 PartySegmentGroupProductStoreId=Product Store Id
 PartySegments=Segments

Modified: trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editcontactmech.bsh
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editcontactmech.bsh	2005-11-04 22:58:51 UTC (rev 6072)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editcontactmech.bsh	2005-11-05 00:14:23 UTC (rev 6073)
@@ -34,8 +34,7 @@
 import org.ofbiz.party.contact.*;
 import org.ofbiz.webapp.control.*;
 
-String partyId = request.getParameter("party_id");
-if (partyId == null) partyId = request.getParameter("partyId");
+String partyId = parameters.get("party_id");
 context.put("partyId", partyId);
 
 Map mechMap = new HashMap();
@@ -43,18 +42,15 @@
 context.put("mechMap", mechMap);
 
 String contactMechId = (String) mechMap.get("contactMechId");
-if(contactMechId != null) context.put("contactMechId", contactMechId);
+context.put("contactMechId", contactMechId);
 
-preContactMechTypeId = request.getParameter("preContactMechTypeId");
-if (preContactMechTypeId == null) preContactMechTypeId = request.getAttribute("preContactMechTypeId");
-if (preContactMechTypeId != null) context.put("preContactMechTypeId", preContactMechTypeId);
+preContactMechTypeId = parameters.get("preContactMechTypeId");
+context.put("preContactMechTypeId", preContactMechTypeId);
 
-paymentMethodId = request.getParameter("paymentMethodId");
-if (paymentMethodId == null) paymentMethodId = request.getAttribute("paymentMethodId");
-if (paymentMethodId != null) context.put("paymentMethodId", paymentMethodId);
+paymentMethodId = parameters.get("paymentMethodId");
+context.put("paymentMethodId", paymentMethodId);
 
-cmNewPurposeTypeId = request.getParameter("contactMechPurposeTypeId");
-if (cmNewPurposeTypeId == null) cmNewPurposeTypeId = request.getAttribute("contactMechPurposeTypeId");
+cmNewPurposeTypeId = parameters.get("contactMechPurposeTypeId");
 if (cmNewPurposeTypeId != null) {
     contactMechPurposeType = delegator.findByPrimaryKey("ContactMechPurposeType", UtilMisc.toMap("contactMechPurposeTypeId", cmNewPurposeTypeId));
     if (contactMechPurposeType != null) {
@@ -65,7 +61,6 @@
     context.put("cmNewPurposeTypeId", cmNewPurposeTypeId);
 }
 
-String donePage = request.getParameter("DONE_PAGE");
-if (donePage == null) donePage = (String) request.getAttribute("DONE_PAGE");
+String donePage = parameters.get("DONE_PAGE");
 if (donePage == null || donePage.length() <= 0) donePage = "viewprofile?party_id=" + partyId + "&partyId=" + partyId;
 context.put("donePage", donePage);

Modified: trunk/applications/party/webapp/partymgr/party/PartyForms.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/party/PartyForms.xml	2005-11-04 22:58:51 UTC (rev 6072)
+++ trunk/applications/party/webapp/partymgr/party/PartyForms.xml	2005-11-05 00:14:23 UTC (rev 6073)
@@ -328,17 +328,19 @@
 
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
-    <form name="ListSegmentRoles" type="list"
-        target="updateSegmentGroupRole" title=""
+    <form name="ListSegmentRoles" type="list" target="updateSegmentGroupRole" title=""
         default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
         <actions>
             <entity-and entity-name="SegmentGroupRole">
                 <field-map field-name="partyId" />
             </entity-and>
         </actions>
-        <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.PartySegmentGroupId}"><display/></field>
-        <field name="partyId" title="${uiLabelMap.PartyId}"><display/></field>
-        <field name="roleTypeId" title="${uiLabelMap.PartySegmentGroupTypeId}">
+        <field name="segmentGroupId" title="${uiLabelMap.PartySegmentGroupId}">
+            <display-entity entity-name="SegmentGroup">
+                <sub-hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup?segmentGroupId=${segmentGroupId}" target-type="inter-app" link-style="buttontext"/>
+            </display-entity>
+        </field>
+        <field name="roleTypeId" title="${uiLabelMap.PartyRole}">
             <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -354,7 +356,7 @@
             <lookup target-form-name="LookupSegmentGroup"/>
         </field>
 
-        <field name="partyId"><display/></field>
+        <field name="partyId"><hidden/></field>
         <field name="roleTypeId">
             <drop-down>
                 <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">

Modified: trunk/applications/party/widget/partymgr/PartyScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/PartyScreens.xml	2005-11-04 22:58:51 UTC (rev 6072)
+++ trunk/applications/party/widget/partymgr/PartyScreens.xml	2005-11-05 00:14:23 UTC (rev 6073)
@@ -436,9 +436,9 @@
             <actions>
                 <set field="titleProperty" value="PageTitleViewPartySegmentRoles"/>
                 <set field="headerItem" value="find"/>
-                <set field="tabButtonItem" value="ViewPartySegmentRoles"/>
+                <set field="tabButtonItem" value="ViewSegmentRoles"/>
                 
-                <set field="labelTitleProperty" value="PartyViewSegmentRoles"/>
+                <set field="labelTitleProperty" value="ViewSegmentRoles"/>
                 
                 <set field="partyId" from-field="parameters.partyId"/>
                 <entity-one entity-name="Party" value-name="party"/>