You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/08/22 02:33:50 UTC
svn commit: r987842 - in /ofbiz/branches/release10.04: ./
applications/product/webapp/facility/facility/EditFacility.ftl
Author: jleroux
Date: Sun Aug 22 00:33:49 2010
New Revision: 987842
URL: http://svn.apache.org/viewvc?rev=987842&view=rev
Log:
"Applied fix from trunk for revision: 987841"
------------------------------------------------------------------------
r987841 | jleroux | 2010-08-22 02:27:09 +0200 (dim. 22 ao–t 2010) | 7 lignes
A patch from Rene Scheibe "Facility Manager: "Default Weight Unit" is not shown correctly" https://issues.apache.org/jira/browse/OFBIZ-3893) - OFBIZ-3893
page: Looking at https://127.0.0.1:8443/facility/control/UpdateFacility
The "Default Weight Unit" is not shown correctly. It is always showing "none".
This was not fixed correctly in rev 931700. Just added selected="selected".
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 00:33:49 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841
Modified: ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl?rev=987842&r1=987841&r2=987842&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl Sun Aug 22 00:33:49 2010
@@ -67,8 +67,7 @@ under the License.
<#list weightUomList as uom>
<option value='${uom.uomId}'
<#if (facility.defaultWeightUomId?has_content) && (uom.uomId == facility.defaultWeightUomId)>
-
-
+ selected="selected"
</#if>
>${uom.get("description",locale)?default(uom.uomId)}</option>
</#list>
@@ -89,7 +88,6 @@ under the License.
</select>
</td>
</tr>
-
<tr>
<td class="label">${uiLabelMap.ProductName}</td>
<td><input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60" /></td>
@@ -121,7 +119,6 @@ under the License.
<td class="label">${uiLabelMap.ProductDefaultDaysToShip}</td>
<td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20" /></td>
</tr>
-
<tr>
<td> </td>
<#if facilityId?has_content>