details: https://code.openbravo.com/erp/devel/pi/rev/52f3ac37c681 changeset: 14148:52f3ac37c681 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Oct 27 22:43:10 2011 +0200 summary: Fixes issue 18912 New from Recent list is not working
details: https://code.openbravo.com/erp/devel/pi/rev/04f77cf8a19b changeset: 14149:04f77cf8a19b user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Oct 27 23:30:20 2011 +0200 summary: Related to issue 18586: Extend grid linking to include filter settings details: https://code.openbravo.com/erp/devel/pi/rev/85333cdce423 changeset: 14150:85333cdce423 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Oct 27 23:31:45 2011 +0200 summary: Related to issue 18901: Improve default view loading details: https://code.openbravo.com/erp/devel/pi/rev/44bbe9d6e787 changeset: 14151:44bbe9d6e787 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Oct 27 23:32:32 2011 +0200 summary: Related to issue issue 18901: Improve default view loading details: https://code.openbravo.com/erp/devel/pi/rev/16617dd5209a changeset: 14152:16617dd5209a user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Oct 27 23:32:57 2011 +0200 summary: Merged heads diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 5 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 10 --------- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 11 ++------- modules/org.openbravo.client.kernel/jslint/jslint | 4 +- 5 files changed, 8 insertions(+), 24 deletions(-) diffs (100 lines): diff -r 490e626bad98 -r 16617dd5209a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Oct 27 20:34:21 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Oct 27 23:32:57 2011 +0200 @@ -511,7 +511,7 @@ if (this.view.tabId === this.view.standardWindow.additionalCriteriaTabId && this.view.standardWindow.additionalCriteria) { crit = isc.JSON.decode(unescape(this.view.standardWindow.additionalCriteria)); - this.delayCall('fetchData', [crit], 100, this); + this.delayCall('storeViewFilter', [crit], 100, this); delete this.view.standardWindow.additionalCriteria; } // if there is no autoexpand field then just divide the space diff -r 490e626bad98 -r 16617dd5209a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Thu Oct 27 20:34:21 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Thu Oct 27 23:32:57 2011 +0200 @@ -520,10 +520,9 @@ url = url + '?tabId=' + this.tabId; if (this.isShowingForm && this.viewForm.isNew && this.isRootView) { url = url + '&command=NEW'; - } else if (this.viewGrid.getSelectedRecords() && this.viewGrid.getSelectedRecords().length === 1) { + } else if ((this.isShowingForm || !this.isRootView) && this.viewGrid.getSelectedRecords() && this.viewGrid.getSelectedRecords().length === 1) { url = url + '&recordId=' + this.viewGrid.getSelectedRecord().id; - } - if (!this.isShowingForm) { + } else if (!this.isShowingForm && this.isRootView) { crit = this.viewGrid.getCriteria(); if (crit && crit.criteria && crit.criteria.length > 0) { url = url + '&criteria=' + escape(isc.JSON.encode(crit, {prettyPrint: false, dateFormat: 'dateConstructor'})); diff -r 490e626bad98 -r 16617dd5209a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js Thu Oct 27 20:34:21 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js Thu Oct 27 23:32:57 2011 +0200 @@ -39,8 +39,6 @@ isc.OBStandardWindow.addProperties({ toolBarLayout: null, - ownMainTabHandling: true, - view: null, viewProperties: null, @@ -169,7 +167,6 @@ if (defaultView) { OB.Personalization.applyViewDefinition(defaultView.personalizationId, defaultView.viewDefinition, this); } - this.addToMainTab(); this.getClass().personalization.views.sort(function(v1, v2) { var t1 = v1.viewDefinition.name, t2 = v2.viewDefinition.name; @@ -183,13 +180,6 @@ } }, - addToMainTab: function() { - this.mainTabSet.updateTab(this.mainTabId, this); - - // and show it - this.mainTabSet.selectTab(this.mainTabId); - }, - // Update the personalization record which is stored updateFormPersonalization: function(view, formPersonalization) { if (!this.getClass().personalization) { diff -r 490e626bad98 -r 16617dd5209a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js Thu Oct 27 20:34:21 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js Thu Oct 27 23:32:57 2011 +0200 @@ -344,15 +344,10 @@ if (viewTabId !== null) { // refresh the view - if (viewInstance.ownMainTabHandling) { - viewInstance.mainTabSet = tabSet; - viewInstance.mainTabId = viewTabId; - } else { - tabSet.updateTab(viewTabId, viewInstance); + tabSet.updateTab(viewTabId, viewInstance); - // and show it - tabSet.selectTab(viewTabId); - } + // and show it + tabSet.selectTab(viewTabId); // tell the viewinstance what tab it is on // note do not use tabId on the viewInstance diff -r 490e626bad98 -r 16617dd5209a modules/org.openbravo.client.kernel/jslint/jslint --- a/modules/org.openbravo.client.kernel/jslint/jslint Thu Oct 27 20:34:21 2011 +0200 +++ b/modules/org.openbravo.client.kernel/jslint/jslint Thu Oct 27 23:32:57 2011 +0200 @@ -1,10 +1,10 @@ #!/bin/sh # --browser doesn't work properly in jslint4java 1.4.7 -# adding the global available functions manually: window, unscape, top, alert +# adding the global available functions manually: window, unscape, top, alert, escape # adding globals present in qunit: ok, test, module, expect, same, stop, start, equals, asyncTest echo "Checking --> $@" java -jar ./modules/org.openbravo.client.kernel/lib/runtime/jslint4java-1.4.7.jar \ --browser --evil --continue --undef \ - --predef window,unescape,top,alert,isc,OB,ok,test,module,expect,same,stop,start,asyncTest,equals "$@" + --predef window,unescape,escape,top,alert,isc,OB,ok,test,module,expect,same,stop,start,asyncTest,equals "$@" ------------------------------------------------------------------------------ The demand for IT networking professionals continues to grow, and the demand for specialized networking skills is growing even more rapidly. Take a complimentary Learning@Cisco Self-Assessment and learn about Cisco certifications, training, and career opportunities. http://p.sf.net/sfu/cisco-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
