details: /erp/devel/pi/rev/467141202544
changeset: 9424:467141202544
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Dec 27 17:43:58 2010 +0100
summary: [cleanup] Fixed autosave
diffstat:
src-wad/src/org/openbravo/wad/javasource.javaxml | 2 +-
src-wad/src/org/openbravo/wad/javasourceSortTab.javaxml | 4 ++--
src/org/openbravo/erpCommon/utility/Utility_data.xsql | 14 +-------------
3 files changed, 4 insertions(+), 16 deletions(-)
diffs (64 lines):
diff -r 2503a22e795d -r 467141202544
src-wad/src/org/openbravo/wad/javasource.javaxml
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml Mon Dec 27 16:47:41
2010 +0100
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml Mon Dec 27 17:43:58
2010 +0100
@@ -1071,7 +1071,7 @@
xmlDocument.setParameter("changed", "");
xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage()
+ "\";");
xmlDocument.setParameter("theme", vars.getTheme());
- final String strMappingName = UtilityData.selectObjectMapping(this, tabId);
+ final String strMappingName = Utility.getTabURL(tabId, "E", false);
xmlDocument.setParameter("mappingName", strMappingName);
xmlDocument.setParameter("confirmOnChanges",
Utility.getJSConfirmOnChanges(vars, windowId));
//xmlDocument.setParameter("buttonReference", Utility.messageBD(this,
"Reference", vars.getLanguage()));
diff -r 2503a22e795d -r 467141202544
src-wad/src/org/openbravo/wad/javasourceSortTab.javaxml
--- a/src-wad/src/org/openbravo/wad/javasourceSortTab.javaxml Mon Dec 27
16:47:41 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/javasourceSortTab.javaxml Mon Dec 27
17:43:58 2010 +0100
@@ -70,7 +70,7 @@
return;
}
- vars.removeSessionValue(UtilityData.selectObjectMapping(this, tabId) +
"|hash");
+ vars.removeSessionValue(Utility.getTabURL(tabId, "E", false) + "|hash");
vars.setSessionObject(tabId + "|failedAutosave", false);
if (vars.commandIn("DEFAULT", "NEW")) {
<PARAMETER_TMP id="parent"> String strP<PARENT_TMP
id="keyParent">Almacen</PARENT_TMP> = vars.getGlobalVariable("inp<PARENT_TMP
id="keyParentINP">Almacen</PARENT_TMP>", windowId + "|<PARENT_TMP
id="keyParent">Almacen</PARENT_TMP>");
@@ -360,7 +360,7 @@
xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage()
+ "\";");
xmlDocument.setData("structure1", data2);
xmlDocument.setData("structure2", data);
- final String strMappingName = UtilityData.selectObjectMapping(this, tabId);
+ final String strMappingName = Utility.getTabURL(tabId, "E", false);
xmlDocument.setParameter("mappingName", strMappingName);
xmlDocument.setParameter("confirmOnChanges",
Utility.getJSConfirmOnChanges(vars, windowId));
<PARAMETER_TMP id="parent"> if (vars.getLanguage().equals("en_US"))
xmlDocument.setParameter("parent", <PARAMETER_TMP
id="class">Almacen</PARAMETER_TMP>Data.selectParent(this<FIELD_TMP
id="language">, vars.getLanguage()</FIELD_TMP>, strP<PARENT_TMP
id="keyParent">Almacen</PARENT_TMP>));
diff -r 2503a22e795d -r 467141202544
src/org/openbravo/erpCommon/utility/Utility_data.xsql
--- a/src/org/openbravo/erpCommon/utility/Utility_data.xsql Mon Dec 27
16:47:41 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/Utility_data.xsql Mon Dec 27
17:43:58 2010 +0100
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2008 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -100,18 +100,6 @@
</Sql>
<Parameter name="adTabId"/>
</SqlMethod>
- <SqlMethod name="selectObjectMapping" type="preparedStatement"
return="String" default="">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- SELECT m.mappingname
- FROM ad_model_object o, ad_model_object_mapping m
- WHERE o.ad_model_object_id = m.ad_model_object_id
- AND o.ad_tab_id = ?
- AND o.isdefault = 'Y'
- AND m.isdefault = 'Y'
- </Sql>
- <Parameter name="adTabId"/>
- </SqlMethod>
<SqlMethod name="isTreeTab" type="preparedStatement" return="boolean"
default="false">
<SqlMethodComment></SqlMethodComment>
<Sql>
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
