odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[fix]fix code according to suggestion. 

bzr revid: vme@tinyerp.com-20111208055909-coh3vxbbqxo7j250
This commit is contained in:
Vidhin Mehta (OpenERP) 2011-12-08 11:29:09 +05:30
parent 2d61e51473
commit b93b2f4025
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/view_list.js
View File

@ -212,7 +212,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
this.$element.find('.oe-list-add')
.click(this.do_add_record)
.attr('disabled', grouped && !this.options.editable);
.attr('disabled', grouped && this.options.editable);
this.$element.find('.oe-list-delete')
.attr('disabled', true)
.click(this.do_delete_selected);

10
addons/web/static/src/js/views.js
View File

@ -243,12 +243,16 @@ session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.View
*/
on_mode_switch: function(view_type, no_store) {
var self = this,
view = this.views[view_type],
view_promise;
if(!view)
return $.Deferred().reject();
if (!no_store) {
this.views_history.push(view_type);
}
this.active_view = view_type;
var view = this.views[view_type];
if (!view.controller) {
// Lazy loading of views
var controllerclass = this.registry.get_object(view_type);
@ -471,8 +475,8 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
},
on_mode_switch: function (view_type, no_store) {
var self = this;
if (!_.include(_.pluck(this.views_src,"view_type"),view_type))
return;
if (!(view_type in this.views))
return $.Deferred().reject();
var switched = $.when(this._super(view_type, no_store)).then(function () {
self.$element.find('.oe-view-manager-logs:first')