Author: jonesde
Date: Mon Mar 5 17:26:40 2007
New Revision: 514945
URL: http://svn.apache.org/viewvc?view=rev&rev=514945
Log:
Based on dev conf feedback: changed delete files box on import dir to not be
checked, regardless of whether or not the path has_content; also changed the
import page to have entity-engine-xml open and close tags by default
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl?view=diff&rev=514945&r1=514944&r2=514945
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl Mon
Mar 5 17:26:40 2007
@@ -36,7 +36,8 @@
</form>
<form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
<div class="tabletext">${uiLabelMap.WebtoolsMessage4}:</div>
- <textarea class="textAreaBox" rows="20" cols="85"
name="fulltext">${fulltext?if_exists}</textarea>
+ <textarea class="textAreaBox" rows="20" cols="85"
name="fulltext">${fulltext?default("<entity-engine-xml>
+</entity-engine-xml>")}</textarea>
<br/><input type="submit" value="${uiLabelMap.WebtoolsImportText}"/>
</form>
<hr/>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl?view=diff&rev=514945&r1=514944&r2=514945
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
Mon Mar 5 17:26:40 2007
@@ -25,10 +25,10 @@
<form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
<div class="tabletext">${uiLabelMap.WebtoolsAbsolutePath}:</div>
<div><input type="text" class="inputBox" size="60" name="path"
value="${path?if_exists}"/></div>
- <div class="tabletext"><input type="checkbox" name="mostlyInserts" <#if
mostlyInserts?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}</div>
- <div class="tabletext"><input type="checkbox" name="maintainTimeStamps"
<#if
keepStamps?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</div>
- <div class="tabletext"><input type="checkbox" name="createDummyFks" <#if
createDummyFks?exists>"checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</div>
- <div class="tabletext"><input type="checkbox" name="deleteFiles" <#if
(deleteFiles?exists ||
!path?has_content)>"checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}</div>
+ <div class="tabletext"><input type="checkbox" name="mostlyInserts" <#if
mostlyInserts?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}</div>
+ <div class="tabletext"><input type="checkbox" name="maintainTimeStamps"
<#if
keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</div>
+ <div class="tabletext"><input type="checkbox" name="createDummyFks" <#if
createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</div>
+ <div class="tabletext"><input type="checkbox" name="deleteFiles" <#if
(deleteFiles?exists)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}</div>
<div class="tabletext">${uiLabelMap.WebtoolsTimeoutSeconds}:<input
type="text" size="6" value="${txTimeoutStr?default("7200")}"
name="txTimeout"/></div>
<div class="tabletext">${uiLabelMap.WebtoolsPause}:<input type="text"
size="6" value="${filePauseStr?default("0")}" name="filePause"/></div>
<div><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
