pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Merge with trunk branch then arise some problem.

Browse Source 
bzr revid: ysa@tinyerp.com-20110811100928-yxwa99yzkm49omk5
This commit is contained in:
Yogesh (OpenERP)
2011-08-11 15:39:28 +05:30
parent a0f6a7fca7
commit 8f00fb00c9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/static/src/js/views.js
+1 -1
View File
@@ -50,7 +50,7 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
this.log("Action manager can't handle action of type " + action.type, action);
return;
}
this[type](action, on_close);
this[type](action, on_closed);
},
ir_actions_act_window: function (action, on_close) {
if (action.flags.popup) {
addons/base_kanban/static/src/js/kanban.js
+8 -5
View File
@@ -31,7 +31,9 @@ openerp.base_kanban.KanbanView = openerp.base.View.extend({
}
});
if(this.template_xml){
self.dataset.read_slice([], 0, false, function (records) {
self.dataset.read_slice({
context: self.dataset.get_context(),
domain: self.dataset.get_domain()}, function (records) {
self.all_display_data = [{'records': records, 'value':false, 'header': false, 'ids': self.dataset.ids}];
self.on_show_data(self.all_display_data);
});
@@ -43,6 +45,7 @@ openerp.base_kanban.KanbanView = openerp.base.View.extend({
this.all_records = [];
var new_qweb = new QWeb2.Engine();
self.$element.html(QWeb.render("KanbanBiew", {"datas" :datas}));
this.on_reload_kanban();
this.$element.find(".oe_column").sortable({
connectWith: ".oe_column",
@@ -74,7 +77,7 @@ openerp.base_kanban.KanbanView = openerp.base.View.extend({
group.list([],
function (groups) {},
function (dataset) {
dataset.read_slice(false, false, false, function(records) {
dataset.read_slice({}, function(records) {
var index = parseInt(_.indexOf(dataset.ids, record_id));
if(index >= 0) {
self.on_confirm_click(dataset, button_attrs, index, record_id);
@@ -105,7 +108,7 @@ openerp.base_kanban.KanbanView = openerp.base.View.extend({
_.extend(this.dataset, {
domain: dataset.domain,
context: dataset.get_context()
}).read_slice([], 0, false, function () {
}).read_slice({}, function () {
self.dataset.index = index;
self.do_switch_view('form');
});
@@ -294,7 +297,7 @@ openerp.base_kanban.KanbanView = openerp.base.View.extend({
self.domain = dataset.domain;
self.context = dataset.context;
self.groups = [];
self.dataset.read_slice(false, false, false, function(records) {
self.dataset.read_slice({}, function(records) {
self.all_display_data = [{'records': records, 'value':false, 'header' : false, 'ids': self.dataset.ids}];
self.$element.find("#kanbanview").remove();
self.on_show_data(self.all_display_data);
@@ -321,7 +324,7 @@ openerp.base_kanban.KanbanView = openerp.base.View.extend({
group_name = group.value[1]
group_value = group.value[0]
}
self.dataset.read_slice(false, false, false, function(records) {
self.dataset.read_slice({}, function(records) {
self.all_display_data.push({"value" : group_value, "records": records, 'header':group_name, 'ids': self.dataset.ids});
if (datagroups.length == self.all_display_data.length) {
self.$element.find("#kanbanview").remove();