Vidhin Mehta (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-trigger-on_prev_view into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-trigger-on_prev_view/+merge/129179
Replace callbackenable methods for 'on_prev_view'.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-trigger-on_prev_view/+merge/129179
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-trigger-on_prev_view.
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2012-10-11 12:57:48 +0000
+++ addons/web/static/src/js/view_form.js 2012-10-11 13:04:21 +0000
@@ -956,7 +956,7 @@
var self = this;
return this.reload_mutex.exec(function() {
if (self.dataset.index == null) {
- self.do_prev_view();
+ self.trigger("previous_view");
return $.Deferred().reject().promise();
}
if (self.dataset.index == null || self.dataset.index < 0) {
=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js 2012-10-10 11:30:25 +0000
+++ addons/web/static/src/js/views.js 2012-10-11 13:04:21 +0000
@@ -525,8 +525,8 @@
controller.set_embedded_view(view.embedded_view);
}
controller.on('switch_mode', self, this.switch_mode);
-
- controller.do_prev_view.add_last(this.on_prev_view);
+ controller.on('previous_view', self, this.prev_view);
+
var container = this.$el.find(".oe_view_manager_view_" + view_type);
var view_promise = controller.appendTo(container);
this.views[view_type].controller = controller;
@@ -602,7 +602,7 @@
* @param {String} [options.default=null] view to switch to if no previous view
* @returns {$.Deferred} switching end signal
*/
- on_prev_view: function (options) {
+ prev_view: function (options) {
options = options || {};
var current_view = this.views_history.pop();
var previous_view = this.views_history[this.views_history.length - 1] || options['default'];
@@ -1266,8 +1266,7 @@
* @param {Boolean} [options.created=false] resource was created
* @param {String} [options.default=null] view to switch to if no previous view
*/
- do_prev_view: function (options) {
- },
+
do_search: function(view) {
},
on_sidebar_export: function() {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
