Author: sichen
Date: Mon Oct 8 13:49:48 2007
New Revision: 582967
URL: http://svn.apache.org/viewvc?rev=582967&view=rev
Log:
removed restriction that only internal organization can be owner parties of
facilities
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh
ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh?rev=582967&r1=582966&r2=582967&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh
Mon Oct 8 13:49:48 2007
@@ -44,10 +44,6 @@
if (facilityTypes != null)
context.put("facilityTypes", facilityTypes);
-// possible owners of facilities
-ownerParties = delegator.findByAndCache("PartyRole",
UtilMisc.toMap("roleTypeId", "INTERNAL_ORGANIZATIO"));
-context.put("ownerParties", ownerParties);
-
// all possible inventory item types
inventoryItemTypes = delegator.findAllCache("InventoryItemType",
UtilMisc.toList("description"));
context.put("inventoryItemTypes", inventoryItemTypes);
Modified:
ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=582967&r1=582966&r2=582967&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
(original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
Mon Oct 8 13:49:48 2007
@@ -22,14 +22,14 @@
<span class="head1">${uiLabelMap.ProductFacility}</span> <span
class='head2'>${facility.facilityName?if_exists}
[${uiLabelMap.CommonId}:${facilityId?if_exists}]</span>
<br/>
<div class="button-bar">
- <a href="<@ofbizUrl>EditFacility</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+ <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" name="EditFacilityForm"
class="buttontext">${uiLabelMap.ProductNewFacility}</a>
<#if facilityId?has_content>
<a
href="/workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}"
class="buttontext">${uiLabelMap.CommonViewCalendar}</a>
</#if>
</div>
<#if facility?exists && facilityId?has_content>
- <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" method="post">
+ <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" name="EditFaclityForm"
method="post">
<table class="basic-table" cellspacing='0'>
<input type="hidden" name="facilityId" value="${facilityId?if_exists}">
<tr>
@@ -60,13 +60,12 @@
<tr>
<td class="label">${uiLabelMap.ProductFacilityOwner}</td>
<td>
- <select name="ownerPartyId">
- <#if ownerParties?has_content>
- <#list ownerParties as party>
- <option value='${party.partyId?if_exists}' <#if
facility.ownerPartyId?exists && party.partyId =
facility.ownerPartyId>selected</#if>>${Static['org.ofbiz.party.party.PartyHelper'].getPartyName(party)}
(${party.partyId})</option>
- </#list>
- </#if>
- </select>
+ <input type="text" class="inputBox" name="ownerPartyId"
value="${facility.ownerPartyId?if_exists}"/>
+ <span class="tabletext">
+ <a
href="javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');">
+ <img
src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15"
height="14" border="0" alt="Click here For Field Lookup"/>
+ </a>
+ </span>
</td>
</tr>
<tr>
