details: /erp/devel/pi/rev/c1acc35fef75
changeset: 10085:c1acc35fef75
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Jan 24 10:31:01 2011 +0100
summary: [tree] Added tree popup to tabs with trees
details: /erp/devel/pi/rev/b071c4b4756f
changeset: 10086:b071c4b4756f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Jan 24 10:32:00 2011 +0100
summary: [audit] Using ' instead of " for js strings
details: /erp/devel/pi/rev/e81caae0b006
changeset: 10087:e81caae0b006
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Jan 24 12:34:13 2011 +0100
summary: fixed bug 15739: In Oracle, I get an error when disabling Heartbeat
Changed log column from varchar2(4000 byte) to CLOB in this way there is no
size restrictions.
Removed log truncation done for issue #15115, as now is no longer needed.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 11 +++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 21 +++++++--
src-db/database/model/tables/AD_PROCESS_RUN.xml
| 2 +-
src/org/openbravo/scheduling/ProcessRunner.java
| 11 +----
4 files changed, 29 insertions(+), 16 deletions(-)
diffs (96 lines):
diff -r 7b0cca48bc9c -r e81caae0b006
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Mon Jan 24 12:28:48 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Mon Jan 24 12:34:13 2011 +0100
@@ -125,6 +125,17 @@
iconButtons.add(auditBtn);
}
+ // Tree button
+ if (tab.isTreeIncluded()) {
+ IconButton treeBtn = new IconButton();
+ // TODO: set correct type once the icon for the tree is available
+ treeBtn.type = "attach";
+ treeBtn.label = Utility.messageBD(new DalConnectionProvider(), "Tree",
OBContext
+ .getOBContext().getLanguage().getLanguage());
+ treeBtn.action = "OB.ToolbarUtils.showTree(this.view);";
+ iconButtons.add(treeBtn);
+ }
+
return iconButtons;
}
diff -r 7b0cca48bc9c -r e81caae0b006
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon Jan 24 12:28:48 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon Jan 24 12:34:13 2011 +0100
@@ -812,13 +812,22 @@
return;
}
- var popupParams = "Command=POPUP_HISTORY";
- popupParams += "&inpTabId=" + view.tabId;
- popupParams += "&inpTableId=" + view.standardProperties.inpTableId;
+ var popupParams = 'Command=POPUP_HISTORY';
+ popupParams += '&inpTabId=' + view.tabId;
+ popupParams += '&inpTableId=' + view.standardProperties.inpTableId;
if (view.viewGrid.getSelectedRecord()) {
- popupParams += "&inpRecordId=" + view.viewGrid.getSelectedRecord().id;
+ popupParams += '&inpRecordId=' + view.viewGrid.getSelectedRecord().id;
}
- OB.Layout.ClassicOBCompatibility.Popup.open('print', 900, 600,
OB.Application.contextUrl + '/businessUtility/AuditTrail.html?'+popupParams,
'', window, false, false, true);
-};
\ No newline at end of file
+ OB.Layout.ClassicOBCompatibility.Popup.open('audit', 900, 600,
OB.Application.contextUrl + '/businessUtility/AuditTrail.html?'+popupParams,
'', window, false, false, true);
+};
+
+OB.ToolbarUtils.showTree = function(view){
+ // Open tree through menu to have hidden vertical menu which is needed to
show old JS messages
+ var popupParams = 'url=/utility/WindowTree.html';
+ popupParams += 'Command=DEFAULT';
+ pupopParams += '&inpTabId=' + view.tabId;
+ popupParams += '&hideMenu=true&noprefs=true';
+ OB.Layout.ClassicOBCompatibility.Popup.open('tree', 750, 625,
OB.Application.contextUrl + '/security/Menu.html?'+popupParams, '', window,
false, false, true);
+};
diff -r 7b0cca48bc9c -r e81caae0b006
src-db/database/model/tables/AD_PROCESS_RUN.xml
--- a/src-db/database/model/tables/AD_PROCESS_RUN.xml Mon Jan 24 12:28:48
2011 +0100
+++ b/src-db/database/model/tables/AD_PROCESS_RUN.xml Mon Jan 24 12:34:13
2011 +0100
@@ -61,7 +61,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="LOG" primaryKey="false" required="false" type="VARCHAR"
size="4000" autoIncrement="false">
+ <column name="LOG" primaryKey="false" required="false" type="CLOB"
size="4000" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r 7b0cca48bc9c -r e81caae0b006
src/org/openbravo/scheduling/ProcessRunner.java
--- a/src/org/openbravo/scheduling/ProcessRunner.java Mon Jan 24 12:28:48
2011 +0100
+++ b/src/org/openbravo/scheduling/ProcessRunner.java Mon Jan 24 12:34:13
2011 +0100
@@ -11,7 +11,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) 2008-2009 Openbravo SLU
+ * All portions are Copyright (C) 2008-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -91,16 +91,9 @@
} finally {
final String duration = ProcessMonitor.getDuration(endTime - startTime);
ProcessRequestData.update(conn, COMPLETE, requestId);
-
- // Get process log and truncate to 4000 characters if it is bigger
- String processLog = bundle.getLog();
- if (processLog.length() > 4000) {
- processLog = processLog.substring(0, 3997) + "...";
- }
- ProcessRunData.update(conn, ctx.getUser(), status, duration, processLog,
executionId);
+ ProcessRunData.update(conn, ctx.getUser(), status, duration,
bundle.getLog(), executionId);
}
return executionId;
}
-
}
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
