You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2006/07/03 06:10:48 UTC
svn commit: r418674 - in /incubator/ofbiz/trunk/applications/party: config/
script/org/ofbiz/party/party/ servicedef/ src/org/ofbiz/party/party/
webapp/partymgr/party/
Author: jonesde
Date: Sun Jul 2 21:10:48 2006
New Revision: 418674
URL: http://svn.apache.org/viewvc?rev=418674&view=rev
Log:
Re-wrote the create/update/deletePartyRelationship services to get around CLA issue with Christopher Worley; also cleaned up some of the PartyRelationship UI which had some bad labels and no way to not specify a security permission in the drop-down (I don't like the feature in the first place, let alone it being mandatory in the UI)
Modified:
incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties
incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
incubator/ofbiz/trunk/applications/party/servicedef/services.xml
incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
Modified: incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?rev=418674&r1=418673&r2=418674&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/party/config/PartyUiLabels.properties Sun Jul 2 21:10:48 2006
@@ -361,11 +361,11 @@
PartyPartyFrom=Party From
PartyPartyOfTheRoleParty=of the current party in the role of
PartyPartyId=Party ID
-PartyPartyIDUserLoginID=PartyID / UserLoginID
+PartyPartyIDUserLoginID=PartyID/UserLoginID
PartyPartyInTheRoleOf=in the role of
PartyPartyNotDefined=Party not defined
PartyPartyTo=Party To
-PartyPartyWithId=The party with ID
+PartyPartyWithId=of the Party with ID
PartyPassportExpire=Passport Expire
PartyPassportExpireDateNotValidDate=Passport Expire Date is not a valid Date
PartyPassportNumber=Passport Number
Modified: incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=418674&r1=418673&r2=418674&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Sun Jul 2 21:10:48 2006
@@ -699,4 +699,66 @@
<remove-value value-name="addr"/>
</iterate>
</simple-method>
+
+ <!-- PartyRelationship services -->
+ <simple-method method-name="createPartyRelationship" short-description="createPartyRelationship">
+ <if-empty field-name="parameters.partyIdFrom">
+ <set field="parameters.partyIdFrom" from-field="userLogin.partyId"/>
+ <else>
+ <check-permission permission="PARTYMGR_REL" action="_CREATE">
+ <alt-permission permission="PARTYMGR" action="_CREATE"/>
+ <fail-property resource="ServiceErrorUiLabels" property="serviceUtil.no_permission_to_operation"/>
+ </check-permission>
+ </else>
+ </if-empty>
+ <check-errors/>
+
+ <if-empty field-name="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
+ <if-empty field-name="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
+
+ <if-empty field-name="parameters.fromDate"><now-timestamp-to-env env-name="parameters.fromDate"/></if-empty>
+
+ <make-value value-name="newEntity" entity-name="PartyRelationship"/>
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+
+ <create-value value-name="newEntity"/>
+ </simple-method>
+ <simple-method method-name="updatePartyRelationship" short-description="updatePartyRelationship">
+ <if-empty field-name="parameters.partyIdFrom">
+ <set field="parameters.partyIdFrom" from-field="userLogin.partyId"/>
+ <else>
+ <check-permission permission="PARTYMGR_REL" action="_UPDATE">
+ <alt-permission permission="PARTYMGR" action="_UPDATE"/>
+ <fail-property resource="ServiceErrorUiLabels" property="serviceUtil.no_permission_to_operation"/>
+ </check-permission>
+ </else>
+ </if-empty>
+ <check-errors/>
+
+ <if-empty field-name="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
+ <if-empty field-name="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
+
+ <entity-one entity-name="PartyRelationship" value-name="lookedUpValue"/>
+ <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
+ <simple-method method-name="deletePartyRelationship" short-description="deletePartyRelationship">
+ <if-empty field-name="parameters.partyIdFrom">
+ <set field="parameters.partyIdFrom" from-field="userLogin.partyId"/>
+ <else>
+ <check-permission permission="PARTYMGR_REL" action="_DELETE">
+ <alt-permission permission="PARTYMGR" action="_DELETE"/>
+ <fail-property resource="ServiceErrorUiLabels" property="serviceUtil.no_permission_to_operation"/>
+ </check-permission>
+ </else>
+ </if-empty>
+ <check-errors/>
+
+ <if-empty field-name="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
+ <if-empty field-name="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
+
+ <entity-one entity-name="PartyRelationship" value-name="lookedUpValue"/>
+ <remove-value value-name="lookedUpValue"/>
+ </simple-method>
</simple-methods>
Modified: incubator/ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/servicedef/services.xml?rev=418674&r1=418673&r2=418674&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ incubator/ofbiz/trunk/applications/party/servicedef/services.xml Sun Jul 2 21:10:48 2006
@@ -251,44 +251,43 @@
</service>
<!-- Party Relationship services -->
- <service name="interfacePartyRelationshipCreatePK" engine="interface" location="" invoke="">
- <attribute name="partyIdFrom" type="String" mode="IN" optional="true"/>
- <attribute name="partyIdTo" type="String" mode="IN" optional="false"/>
- <attribute name="roleTypeIdFrom" type="String" mode="IN" optional="true"/>
- <attribute name="roleTypeIdTo" type="String" mode="IN" optional="true"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
+ <service name="createPartyRelationship" default-entity-name="PartyRelationship" engine="simple"
+ location="org/ofbiz/party/party/PartyServices.xml" invoke="createPartyRelationship" auth="true">
+ <description>
+ Create a Relationship between two Parties;
+ if partyIdFrom is not specified the partyId of the current userLogin will be used;
+ if roleTypeIds are not specified they will default to "_NA_".
+ If a partyIdFrom is passed in, it will be used if the userLogin has PARTYMGR_REL_CREATE permission.
+ </description>
+ <auto-attributes include="pk" mode="IN" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="partyIdTo" optional="false"/>
</service>
- <service name="interfacePartyRelationshipPK" engine="interface" location="" invoke="">
- <attribute name="partyIdFrom" type="String" mode="IN" optional="false"/>
- <attribute name="partyIdTo" type="String" mode="IN" optional="false"/>
- <attribute name="roleTypeIdFrom" type="String" mode="IN" optional="false"/>
- <attribute name="roleTypeIdTo" type="String" mode="IN" optional="false"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
+ <service name="updatePartyRelationship" default-entity-name="PartyRelationship" engine="simple"
+ location="org/ofbiz/party/party/PartyServices.xml" invoke="updatePartyRelationship" auth="true">
+ <description>
+ Update a Relationship between two Parties;
+ if partyIdFrom is not specified the partyId of the current userLogin will be used;
+ if roleTypeIds are not specified they will default to "_NA_".
+ If a partyIdFrom is passed in, it will be used if the userLogin has PARTYMGR_REL_UPDATE permission.
+ </description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="partyIdFrom" optional="true"/>
+ <override name="roleTypeIdFrom" optional="true"/>
+ <override name="roleTypeIdTo" optional="true"/>
</service>
- <service name="interfacePartyRelationship" engine="interface" location="" invoke="">
- <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
- <attribute name="statusId" type="String" mode="IN" optional="true"/>
- <attribute name="priorityTypeId" type="String" mode="IN" optional="true"/>
- <attribute name="partyRelationshipTypeId" type="String" mode="IN" optional="true"/>
- <attribute name="securityGroupId" type="String" mode="IN" optional="true"/>
- <attribute name="comments" type="String" mode="IN" optional="true"/>
- </service>
- <service name="createPartyRelationship" engine="java"
- location="org.ofbiz.party.party.PartyRelationshipServices" invoke="createPartyRelationship" auth="true">
- <description>Create a Relationship between two Parties; if partyIdFrom is not specified the partyId of the current userLogin will be used; if roleTypeIds are not specified they will default to "_NA_". If a partyId is passed in, it will be used if the userLogin has PARTYMGR_REL_CREATE permission.</description>
- <implements service="interfacePartyRelationshipCreatePK"/>
- <implements service="interfacePartyRelationship"/>
- </service>
- <service name="updatePartyRelationship" engine="java"
- location="org.ofbiz.party.party.PartyRelationshipServices" invoke="updatePartyRelationship" auth="true">
- <description>Update a Relationship between two Parties; if partyIdFrom is not specified the partyId of the current userLogin will be used; if roleTypeIds are not specified they will default to "_NA_". If a partyId is passed in, it will be used if the userLogin has PARTYMGR_REL_UPDATE permission.</description>
- <implements service="interfacePartyRelationshipPK"/>
- <implements service="interfacePartyRelationship"/>
- </service>
- <service name="deletePartyRelationship" engine="java"
- location="org.ofbiz.party.party.PartyRelationshipServices" invoke="deletePartyRelationship" auth="true">
- <description>Delete a Relationship between two Parties; if partyIdFrom is not specified the partyId of the current userLogin will be used; if roleTypeIds are not specified they will default to "_NA_".</description>
- <implements service="interfacePartyRelationshipPK"/>
+ <service name="deletePartyRelationship" default-entity-name="PartyRelationship" engine="simple"
+ location="org/ofbiz/party/party/PartyServices.xml" invoke="deletePartyRelationship" auth="true">
+ <description>
+ Delete a Relationship between two Parties;
+ if partyIdFrom is not specified the partyId of the current userLogin will be used;
+ if roleTypeIds are not specified they will default to "_NA_".
+ </description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <override name="partyIdFrom" optional="true"/>
+ <override name="roleTypeIdFrom" optional="true"/>
+ <override name="roleTypeIdTo" optional="true"/>
</service>
<service name="createPartyRelationshipType" engine="java" default-entity-name="PartyRelationshipType"
Modified: incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java?rev=418674&r1=418673&r2=418674&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java (original)
+++ incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java Sun Jul 2 21:10:48 2006
@@ -23,15 +23,11 @@
*/
package org.ofbiz.party.party;
-import java.sql.Timestamp;
import java.util.HashMap;
import java.util.Map;
-import java.util.Locale;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -53,220 +49,6 @@
public static final String module = PartyRelationshipServices.class.getName();
public static final String resource = "PartyUiLabels";
- /** Creates a PartyRelationship
- *@param ctx The DispatchContext that this service is operating in
- *@param context Map containing the input parameters
- *@return Map with the result of the service, the output parameters
- */
- public static Map createPartyRelationship(DispatchContext ctx, Map context) {
- Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
- Security security = ctx.getSecurity();
- GenericValue userLogin = (GenericValue) context.get("userLogin");
-
- // check permission PARTYMGR_REL_CREATE or use ServiceUtil.getPartyIdCheckSecurity to check permission
- if (!security.hasEntityPermission("PARTYMGR", "_REL_CREATE", userLogin)) {
- // note: partyId isn't used after this, but it might in the future. for now, it is used only to check the security
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_CREATE");
- }
- Locale locale = (Locale) context.get("locale");
- String errMsg = null;
-
- if (result.size() > 0)
- return result;
-
- String partyIdFrom = (String) context.get("partyIdFrom");
- if (partyIdFrom == null) {
- partyIdFrom = (String) userLogin.getString("partyId");
- }
-
- String partyIdTo = (String) context.get("partyIdTo");
- if (partyIdTo == null) {
-// Map messageMap = UtilMisc.toMap("errProductFeatures", e.getMessage());
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.cannot_create_party_relationship_partyIdTo_null", locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- String roleTypeIdFrom = (String) context.get("roleTypeIdFrom");
- if (roleTypeIdFrom == null) {
- roleTypeIdFrom = "_NA_";
- }
-
- String roleTypeIdTo = (String) context.get("roleTypeIdTo");
- if (roleTypeIdTo == null) {
- roleTypeIdTo = "_NA_";
- }
-
- Timestamp fromDate = (Timestamp) context.get("fromDate");
- if (fromDate == null) {
- fromDate = UtilDateTime.nowTimestamp();
- }
-
- try {
- if (delegator.findByPrimaryKey("PartyRole", UtilMisc.toMap("partyId", partyIdFrom, "roleTypeId", roleTypeIdFrom)) == null) {
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.cannot_create_party_relationship_partyIdFrom_not_in_role", locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- if (delegator.findByPrimaryKey("PartyRole", UtilMisc.toMap("partyId", partyIdTo, "roleTypeId", roleTypeIdTo)) == null) {
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.cannot_create_party_relationship_partyIdTo_not_in_role", locale);
- return ServiceUtil.returnError(errMsg);
- }
- } catch (GenericEntityException e) {
- Debug.logWarning(e, module);
- Map messageMap = UtilMisc.toMap("errMessage", e.getMessage());
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.could_not_create_party_role_read", messageMap, locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- GenericValue partyRelationship = delegator.makeValue("PartyRelationship", UtilMisc.toMap("partyIdFrom", partyIdFrom, "partyIdTo", partyIdTo, "roleTypeIdFrom", roleTypeIdFrom, "roleTypeIdTo", roleTypeIdTo, "fromDate", fromDate));
- partyRelationship.setNonPKFields(context);
-
- try {
- if (delegator.findByPrimaryKey(partyRelationship.getPrimaryKey()) != null) {
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.could_not_create_party_role_exists", locale);
- return ServiceUtil.returnError(errMsg);
- }
- } catch (GenericEntityException e) {
- Debug.logWarning(e, module);
- Map messageMap = UtilMisc.toMap("errMessage", e.getMessage());
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.could_not_create_party_role_read", messageMap, locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- try {
- partyRelationship.create();
- } catch (GenericEntityException e) {
- Debug.logWarning(e.getMessage(), module);
- Map messageMap = UtilMisc.toMap("errMessage", e.getMessage());
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.could_not_create_party_relationship_write", messageMap, locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
- return result;
- }
-
- /** Updates a PartyRelationship
- *@param ctx The DispatchContext that this service is operating in
- *@param context Map containing the input parameters
- *@return Map with the result of the service, the output parameters
- */
- public static Map updatePartyRelationship(DispatchContext ctx, Map context) {
- Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
- Security security = ctx.getSecurity();
- GenericValue userLogin = (GenericValue) context.get("userLogin");
-
- // check permission PARTYMGR_REL_UPDATE or use ServiceUtil.getPartyIdCheckSecurity to check permission
- if (!security.hasEntityPermission("PARTYMGR", "_REL_UPDATE", userLogin)) {
- // note: partyId isn't used after this, but it might in the future. for now, it is used only to check the security
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_UPDATE");
- }
- Locale locale = (Locale) context.get("locale");
- String errMsg = null;
-
- if (result.size() > 0)
- return result;
-
- String partyIdFrom = (String) context.get("partyIdFrom");
-
- if (partyIdFrom == null) {
- partyIdFrom = (String) userLogin.getString("partyId");
- }
-
- String partyIdTo = (String) context.get("partyIdTo");
-
- if (partyIdTo == null) {
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.cannot_create_party_relationship_partyIdTo_null", locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- String roleTypeIdFrom = (String) context.get("roleTypeIdFrom");
-
- if (roleTypeIdFrom == null) {
- roleTypeIdFrom = "_NA_";
- }
-
- String roleTypeIdTo = (String) context.get("roleTypeIdTo");
-
- if (roleTypeIdTo == null) {
- roleTypeIdTo = "_NA_";
- }
-
- GenericValue partyRelationship = null;
- try {
- partyRelationship = delegator.findByPrimaryKey("PartyRelationship", UtilMisc.toMap("partyIdFrom", partyIdFrom,
- "partyIdTo", partyIdTo, "roleTypeIdFrom", roleTypeIdFrom, "roleTypeIdTo", roleTypeIdTo, "fromDate", context.get("fromDate")));
- } catch (GenericEntityException e) {
- Debug.logWarning(e, module);
- Map messageMap = UtilMisc.toMap("errMessage", e.getMessage());
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.could_not_update_party_relation_read", messageMap, locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- if (partyRelationship == null) {
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.could_not_update_party_relation_not_found", locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- partyRelationship.setNonPKFields(context);
-
- try {
- partyRelationship.store();
- } catch (GenericEntityException e) {
- Debug.logWarning(e.getMessage(), module);
- errMsg = UtilProperties.getMessage(resource,"partyrelationshipservices.could_not_update_party_relation_write", locale);
- return ServiceUtil.returnError(errMsg);
- }
-
- result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
- return result;
- }
-
- /** Deletes a PartyRelationship
- *@param ctx The DispatchContext that this service is operating in
- *@param context Map containing the input parameters
- *@return Map with the result of the service, the output parameters
- */
- public static Map deletePartyRelationship(DispatchContext ctx, Map context) {
- Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
- Security security = ctx.getSecurity();
- GenericValue userLogin = (GenericValue) context.get("userLogin");
-
- if (!security.hasEntityPermission("PARTYMGR", "_REL_DELETE", userLogin)) {
- // note: partyId isn't used after this, but it might in the future. for now, it is used only to check the security
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_DELETE");
- }
-
- if (result.size() > 0)
- return result;
-
- GenericValue partyRelationship = null;
-
- try {
- partyRelationship = delegator.findByPrimaryKey("PartyRelationship", UtilMisc.toMap("partyIdFrom", context.get("partyIdFrom"), "partyIdTo", context.get("partyIdTo"), "roleTypeIdFrom", context.get("roleTypeIdFrom"), "roleTypeIdTo", context.get("roleTypeIdTo"), "fromDate", context.get("fromDate")));
- } catch (GenericEntityException e) {
- Debug.logWarning(e, module);
- return ServiceUtil.returnError("Could not delete party relationship (read failure): " + e.getMessage());
- }
-
- if (partyRelationship == null) {
- return ServiceUtil.returnError("Could not delete party relationship (partyRelationship not found)");
- }
-
- try {
- partyRelationship.remove();
- } catch (GenericEntityException e) {
- Debug.logWarning(e.getMessage(), module);
- return ServiceUtil.returnError("Could delete party role (write failure): " + e.getMessage());
- }
-
- result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
- return result;
- }
-
/** Creates a PartyRelationshipType
*@param ctx The DispatchContext that this service is operating in
*@param context Map containing the input parameters
@@ -311,5 +93,4 @@
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
return result;
}
-
}
Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl?rev=418674&r1=418673&r2=418674&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl Sun Jul 2 21:10:48 2006
@@ -61,7 +61,7 @@
<td><div class="tabletext"> ${partyRelationship.fromDate}</div></td>
<#if security.hasEntityPermission("PARTYMGR", "_REL_DELETE", session)>
<td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
</td>
</#if>
</tr>
@@ -122,6 +122,7 @@
<#-- set security group specific to this party relationship -->
<br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}
<select name="securityGroupId" class="selectBox">
+ <option value=""> </option>
<#list securityGroups as securityGroup>
<option value="${securityGroup.groupId}">${securityGroup.get("description",locale)}</option>
</#list>
@@ -130,7 +131,7 @@
${uiLabelMap.CommonThru} <input type="text" size="24" name="thruDate" class="inputBox"/><a href="javascript:call_cal(document.addPartyRelationshipTo.thruDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
</div>
<div><span class="tabletext">${uiLabelMap.CommonComments}: </span><input type="text" size="60" name="comments" class="inputBox"/></div>
- <div><a href="javascript:document.addPartyRelationshipTo.submit()" class="buttontext">[${uiLabelMap.CommonAdd}]</a></div>
+ <div><a href="javascript:document.addPartyRelationshipTo.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></div>
</form>
</div>
<div><hr class="sepbar"></div>
@@ -162,6 +163,7 @@
</select>
<br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}
<select name="securityGroupId" class="selectBox">
+ <option value=""> </option>
<#list securityGroups as securityGroup>
<option value="${securityGroup.groupId}">${securityGroup.get("description",locale)}</option>
</#list>
@@ -170,7 +172,7 @@
${uiLabelMap.CommonThru} <input type="text" size="24" name="thruDate" class="inputBox"/><a href="javascript:call_cal(document.addPartyRelationshipFrom.thruDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
</div>
<div><span class="tabletext">${uiLabelMap.CommonComments}: </span><input type="text" size="60" name="comments" class="inputBox"/></div>
- <div><a href="javascript:document.addPartyRelationshipFrom.submit()" class="buttontext">[${uiLabelMap.CommonAdd}]</a></div>
+ <div><a href="javascript:document.addPartyRelationshipFrom.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></div>
</form>
</div>
</#if>