You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by si...@apache.org on 2007/10/08 22:49:49 UTC
svn commit: r582967 - in /ofbiz/trunk/applications/product/webapp/facility:
WEB-INF/actions/facility/EditFacility.bsh facility/EditFacility.ftl
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="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+ <a href="<@o...@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="<@o...@ofbizUrl>" method="post">
+ <form action="<@o...@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="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ </a>
+ </span>
</td>
</tr>
<tr>
Re: svn commit: r582967 - in /ofbiz/trunk/applications/product/webapp/facility:
WEB-INF/actions/facility/EditFacility.bsh facility/EditFacility.ftl
Posted by Jacopo Cappellato <ti...@sastau.it>.
I don't think it was caused by rev. 593024, but I've fixed it in rev. 593753
Thanks,
Jacopo
pmacdee wrote:
> The Owner selector on the New Facility page doesn't appear to work. I used
> to set my company to be an internal organization and then I could find it on
> a pull down. Now I get no action and the Error Console says:
>
> Error: document.EditFacilityForm has no properties
> Source File:
> javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
> Line: 1
>
> the page source has this line
>
>
> href=javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
>
> and there doesn't appear to be corresponding JavaScript for
> "EditFacilityForm" . This SVN commit popped up as being related to this
> problem. Here is my svn info
> svn info
> Path: .
> URL: http://svn.apache.org/repos/asf/ofbiz/trunk
> Repository Root: http://svn.apache.org/repos/asf
> Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
> Revision: 593024
> Node Kind: directory
> Schedule: normal
> Last Changed Author: jacopoc
> Last Changed Rev: 592805
> Last Changed Date: 2007-11-07 08:17:53 -0800 (Wed, 07 Nov 2007)
>
>
>
>
>
>
> sichen wrote:
>> 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 @@
>> ${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists}
>> [${uiLabelMap.CommonId}:${facilityId?if_exists}]
>> <br/>
>> <div class="button-bar">
>> - "<@ofbizUrl EditFacility</...@ofbizUrl>"
>> class="buttontext">${uiLabelMap.ProductNewFacility}
>> + "<@ofbizUrl EditFacility</...@ofbizUrl>" name="EditFacilityForm"
>> class="buttontext">${uiLabelMap.ProductNewFacility}
>> <#if facilityId?has_content>
>>
>> /workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}
>> ${uiLabelMap.CommonViewCalendar}
>> </#if>
>> </div>
>>
>> <#if facility?exists && facilityId?has_content>
>> - <form action="<@o...@ofbizUrl>" method="post">
>> + <form action="<@o...@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}"/>
>> +
>> +
>> javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
>> + "<@ofbizContentUrl
>> /images/fieldlookup.gif"</...@ofbizContentUrl>" width="15" height="14"
>> border="0" alt="Click here For Field Lookup"/>
>> +
>> +
>> </td>
>> </tr>
>> <tr>
>>
>>
>>
>>
>
Re: svn commit: r582967 - in
/ofbiz/trunk/applications/product/webapp/facility:
WEB-INF/actions/facility/EditFacility.bsh facility/EditFacility.ftl
Posted by pmacdee <pa...@hrl.com>.
The Owner selector on the New Facility page doesn't appear to work. I used
to set my company to be an internal organization and then I could find it on
a pull down. Now I get no action and the Error Console says:
Error: document.EditFacilityForm has no properties
Source File:
javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
Line: 1
the page source has this line
href=javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
and there doesn't appear to be corresponding JavaScript for
"EditFacilityForm" . This SVN commit popped up as being related to this
problem. Here is my svn info
svn info
Path: .
URL: http://svn.apache.org/repos/asf/ofbiz/trunk
Repository Root: http://svn.apache.org/repos/asf
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 593024
Node Kind: directory
Schedule: normal
Last Changed Author: jacopoc
Last Changed Rev: 592805
Last Changed Date: 2007-11-07 08:17:53 -0800 (Wed, 07 Nov 2007)
sichen wrote:
>
> 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 @@
> ${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists}
> [${uiLabelMap.CommonId}:${facilityId?if_exists}]
> <br/>
> <div class="button-bar">
> - "<@ofbizUrl EditFacility</...@ofbizUrl>"
> class="buttontext">${uiLabelMap.ProductNewFacility}
> + "<@ofbizUrl EditFacility</...@ofbizUrl>" name="EditFacilityForm"
> class="buttontext">${uiLabelMap.ProductNewFacility}
> <#if facilityId?has_content>
>
> /workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}
> ${uiLabelMap.CommonViewCalendar}
> </#if>
> </div>
>
> <#if facility?exists && facilityId?has_content>
> - <form action="<@o...@ofbizUrl>" method="post">
> + <form action="<@o...@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}"/>
> +
> +
> javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
> + "<@ofbizContentUrl
> /images/fieldlookup.gif"</...@ofbizContentUrl>" width="15" height="14"
> border="0" alt="Click here For Field Lookup"/>
> +
> +
> </td>
> </tr>
> <tr>
>
>
>
>
--
View this message in context: http://www.nabble.com/svn-commit%3A-r582967---in--ofbiz-trunk-applications-product-webapp-facility%3A-WEB-INF-actions-facility-EditFacility.bsh-facility-EditFacility.ftl-tf4590621.html#a13680301
Sent from the OFBiz - Commits mailing list archive at Nabble.com.
Re: svn commit: r582967 - in
/ofbiz/trunk/applications/product/webapp/facility:
WEB-INF/actions/facility/EditFacility.bsh facility/EditFacility.ftl
Posted by pmacdee <pa...@hrl.com>.
The pull-down menu for the Owner on the New Facility page doesn't appear to
work. I used to set my company to be an internal organization and then I
could find it on the pull down. Now I get no action and the Error Console
says:
Error: document.EditFacilityForm has no properties
Source File:
javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
Line: 1
the page source has this line
javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
and there doesn't appear to be corresponding JavaScript for
"EditFacilityForm" . This SVN commit popped up as being related to this
problem. Here is my svn info
svn info
Path: .
URL: http://svn.apache.org/repos/asf/ofbiz/trunk
Repository Root: http://svn.apache.org/repos/asf
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 593024
Node Kind: directory
Schedule: normal
Last Changed Author: jacopoc
Last Changed Rev: 592805
Last Changed Date: 2007-11-07 08:17:53 -0800 (Wed, 07 Nov 2007)
sichen wrote:
>
> 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 @@
> ${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists}
> [${uiLabelMap.CommonId}:${facilityId?if_exists}]
> <br/>
> <div class="button-bar">
> - "<@ofbizUrl EditFacility</...@ofbizUrl>"
> class="buttontext">${uiLabelMap.ProductNewFacility}
> + "<@ofbizUrl EditFacility</...@ofbizUrl>" name="EditFacilityForm"
> class="buttontext">${uiLabelMap.ProductNewFacility}
> <#if facilityId?has_content>
>
> /workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}
> ${uiLabelMap.CommonViewCalendar}
> </#if>
> </div>
>
> <#if facility?exists && facilityId?has_content>
> - <form action="<@o...@ofbizUrl>" method="post">
> + <form action="<@o...@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}"/>
> +
> +
> javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');
> + "<@ofbizContentUrl
> /images/fieldlookup.gif"</...@ofbizContentUrl>" width="15" height="14"
> border="0" alt="Click here For Field Lookup"/>
> +
> +
> </td>
> </tr>
> <tr>
>
>
>
>
--
View this message in context: http://www.nabble.com/svn-commit%3A-r582967---in--ofbiz-trunk-applications-product-webapp-facility%3A-WEB-INF-actions-facility-EditFacility.bsh-facility-EditFacility.ftl-tf4590621.html#a13680286
Sent from the OFBiz - Commits mailing list archive at Nabble.com.