details: /erp/devel/pi/rev/6faa4e77ee45
changeset: 10038:6faa4e77ee45
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jan 21 16:57:53 2011 +0100
summary: [audit] Added audit trail in toolbar
details: /erp/devel/pi/rev/eb19b95b73ca
changeset: 10039:eb19b95b73ca
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jan 21 17:00:27 2011 +0100
summary: [audit] Hide audit button for professional/basic instances that have
not audited table for current tab
details: /erp/devel/pi/rev/e262af20d35f
changeset: 10040:e262af20d35f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jan 21 17:34:27 2011 +0100
summary: [audit] Set alert when selecting >1 record to show audit
details: /erp/devel/pi/rev/1d5862969ab4
changeset: 10041:1d5862969ab4
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jan 21 17:38:41 2011 +0100
summary: [audit] Fixed audit trail popups to work on modal windows
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 12 +++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 23 ++++++++++
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
| 4 +-
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html
| 4 +-
4 files changed, 39 insertions(+), 4 deletions(-)
diffs (104 lines):
diff -r 56750adc3119 -r 1d5862969ab4
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
Fri Jan 21 16:49:58 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Fri Jan 21 17:38:41 2011 +0100
@@ -36,6 +36,7 @@
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.data.Sqlc;
+import org.openbravo.erpCommon.obps.ActivationKey;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.datamodel.Column;
import org.openbravo.model.ad.domain.ModelImplementation;
@@ -113,6 +114,17 @@
if (tab.getProcess() != null) {
iconButtons.addAll(getPrintEmailButtons());
}
+
+ // Audit trail button
+ if (!ActivationKey.getInstance().isActive() ||
tab.getTable().isFullyAudited()) {
+ IconButton auditBtn = new IconButton();
+ auditBtn.type = "audit";
+ auditBtn.label = Utility.messageBD(new DalConnectionProvider(),
"AuditTrail", OBContext
+ .getOBContext().getLanguage().getLanguage());
+ auditBtn.action = "OB.ToolbarUtils.showAuditTrail(this.view);";
+ iconButtons.add(auditBtn);
+ }
+
return iconButtons;
}
diff -r 56750adc3119 -r 1d5862969ab4
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
Fri Jan 21 16:49:58 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Fri Jan 21 17:38:41 2011 +0100
@@ -721,5 +721,28 @@
view.setContextInfo(sessionProperties, function() {
OB.Layout.ClassicOBCompatibility.Popup.open('print', 0, 0,
OB.Application.contextUrl +
'/businessUtility/PrinterReports.html?'+popupParams, '', window, false, false,
true);
});
+};
+
+OB.ToolbarUtils.showAuditTrail = function(view){
+ var selectedRecords = view.viewGrid.getSelectedRecords();
+
+ if (selectedRecords.length > 1) {
+ var setWarning = {
+ set: function(label){
+ view.messageBar.setMessage(OBMessageBar.TYPE_WARNING, '', label);
+ }
+ };
+ OB.I18N.getLabel('JS28', null, setWarning, 'set');
+ return;
+ }
+ var popupParams = "Command=POPUP_HISTORY";
+ popupParams += "&inpTabId=" + view.tabId;
+ popupParams += "&inpTableId=" + view.standardProperties.inpTableId;
+
+ if (view.viewGrid.getSelectedRecord()) {
+ 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
diff -r 56750adc3119 -r 1d5862969ab4
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
--- a/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
Fri Jan 21 16:49:58 2011 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
Fri Jan 21 17:38:41 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) 2009-2010 Openbravo SLU
+ * All portions are Copyright (C) 2009-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -498,7 +498,7 @@
<button type="button"
id="buttonClose"
class="ButtonLink"
- onclick="window.close();return false;"
+ onclick="closePage();return false;"
onfocus="buttonEvent('onfocus', this);
window.status='Accept'; return true;"
onblur="buttonEvent('onblur', this);"
onkeyup="buttonEvent('onkeyup', this);"
diff -r 56750adc3119 -r 1d5862969ab4
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html
--- a/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html
Fri Jan 21 16:49:58 2011 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html
Fri Jan 21 17:38:41 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) 2009-2010 Openbravo SLU
+ * All portions are Copyright (C) 2009-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -488,7 +488,7 @@
<button type="button"
id="buttonClose"
class="ButtonLink"
- onclick="window.close();return false;"
+ onclick="closePage();return false;"
onfocus="buttonEvent('onfocus', this);
window.status='Accept'; return true;"
onblur="buttonEvent('onblur', this);"
onkeyup="buttonEvent('onkeyup', this);"
------------------------------------------------------------------------------
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
