Author: sichen
Date: Tue Oct 24 09:40:34 2006
New Revision: 467375
URL: http://svn.apache.org/viewvc?view=rev&rev=467375
Log:
Uncommented accidental commenting out of picklistActiveList lookup for the
picklist manage screen
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?view=diff&rev=467375&r1=467374&r2=467375
==============================================================================
---
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
(original)
+++
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
Tue Oct 24 09:40:34 2006
@@ -110,7 +110,7 @@
<input type"text" size="2"
name="binLocationNumber"
value="${picklistBinInfo.picklistBin.binLocationNumber}"/>
${uiLabelMap.PageTitlePickList}:
<select name="picklistId" class="smallSelect">
- <#list picklistActiveList as picklistActive>
+ <#list picklistActiveList?if_exists as
picklistActive>
<#assign picklistActiveStatusItem =
picklistActive.getRelatedOneCache("StatusItem")>
<option
value="${picklistActive.picklistId}"<#if picklistActive.picklistId ==
picklist.picklistId> selected</#if>>${picklistActive.picklistId}
[${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option>
</#list>
Modified:
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=467375&r1=467374&r2=467375
==============================================================================
---
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Tue Oct 24 09:40:34 2006
@@ -626,7 +626,6 @@
<entity-condition entity-name="PartyRoleAndPartyDetail"
list-name="partyRoleAndPartyDetailList" use-cache="true">
<condition-expr field-name="roleTypeId" value="PICKER"/>
</entity-condition>
- <!--
<entity-condition entity-name="Picklist"
list-name="picklistActiveList">
<condition-list combine="and">
<condition-expr field-name="facilityId"
operator="equals" env-name="parameters.facilityId"/>
@@ -636,7 +635,6 @@
</condition-list>
<order-by field-name="picklistDate"/>
</entity-condition>
- -->
</actions>
<widgets>
<decorator-screen name="CommonFacilityDecorator">
