[REM] Removed Dataset#count property
bzr revid: fme@openerp.com-20110629084459-x762jowmu14j6xak
This commit is contained in:
parent
9decec9915
commit
f84c547a84
|
@ -234,20 +234,19 @@ openerp.base.DataSet = openerp.base.Controller.extend( /** @lends openerp.base.
|
||||||
this.model = model;
|
this.model = model;
|
||||||
this.context = context || {};
|
this.context = context || {};
|
||||||
this.index = null;
|
this.index = null;
|
||||||
this.count = 0;
|
|
||||||
},
|
},
|
||||||
start: function() {
|
start: function() {
|
||||||
},
|
},
|
||||||
previous: function () {
|
previous: function () {
|
||||||
this.index -= 1;
|
this.index -= 1;
|
||||||
if (this.index < 0) {
|
if (this.index < 0) {
|
||||||
this.index = this.count - 1;
|
this.index = this.ids.length - 1;
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
},
|
},
|
||||||
next: function () {
|
next: function () {
|
||||||
this.index += 1;
|
this.index += 1;
|
||||||
if (this.index >= this.count) {
|
if (this.index >= this.ids.length) {
|
||||||
this.index = 0;
|
this.index = 0;
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
|
@ -365,7 +364,6 @@ openerp.base.DataSetStatic = openerp.base.DataSet.extend({
|
||||||
this._super(session, model, context);
|
this._super(session, model, context);
|
||||||
// all local records
|
// all local records
|
||||||
this.ids = ids || [];
|
this.ids = ids || [];
|
||||||
this.count = this.ids.length;
|
|
||||||
if (this.ids.length) {
|
if (this.ids.length) {
|
||||||
this.index = 0;
|
this.index = 0;
|
||||||
}
|
}
|
||||||
|
@ -378,9 +376,8 @@ openerp.base.DataSetStatic = openerp.base.DataSet.extend({
|
||||||
},
|
},
|
||||||
set_ids: function (ids) {
|
set_ids: function (ids) {
|
||||||
this.ids = ids;
|
this.ids = ids;
|
||||||
this.count = this.ids.length;
|
this.index = this.index <= this.ids.length - 1 ?
|
||||||
this.index = this.index <= this.count - 1 ?
|
this.index : (this.ids.length > 0 ? this.length - 1 : 0);
|
||||||
this.index : (this.count > 0 ? this.count - 1 : 0);
|
|
||||||
},
|
},
|
||||||
unlink: function(ids) {
|
unlink: function(ids) {
|
||||||
this.on_unlink(ids);
|
this.on_unlink(ids);
|
||||||
|
@ -423,7 +420,6 @@ openerp.base.DataSetSearch = openerp.base.DataSet.extend({
|
||||||
}, function (records) {
|
}, function (records) {
|
||||||
self.ids.splice(0, self.ids.length);
|
self.ids.splice(0, self.ids.length);
|
||||||
self.offset = offset;
|
self.offset = offset;
|
||||||
self.count = records.length; // TODO: get real count
|
|
||||||
for (var i=0; i < records.length; i++ ) {
|
for (var i=0; i < records.length; i++ ) {
|
||||||
self.ids.push(records[i].id);
|
self.ids.push(records[i].id);
|
||||||
}
|
}
|
||||||
|
@ -463,9 +459,8 @@ openerp.base.DataSetSearch = openerp.base.DataSet.extend({
|
||||||
var self = this;
|
var self = this;
|
||||||
return this._super(ids, function(result) {
|
return this._super(ids, function(result) {
|
||||||
self.ids = _.without.apply(_, [self.ids].concat(ids));
|
self.ids = _.without.apply(_, [self.ids].concat(ids));
|
||||||
self.count = self.ids.length;
|
self.index = self.index <= self.ids.length - 1 ?
|
||||||
self.index = self.index <= self.count - 1 ?
|
self.index : (self.ids.length > 0 ? self.ids.length -1 : 0);
|
||||||
self.index : (self.count > 0 ? self.count -1 : 0);
|
|
||||||
if (callback)
|
if (callback)
|
||||||
callback(result);
|
callback(result);
|
||||||
}, error_callback);
|
}, error_callback);
|
||||||
|
|
|
@ -157,7 +157,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV
|
||||||
var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager');
|
var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager');
|
||||||
var index = hide_index ? '-' : this.dataset.index + 1;
|
var index = hide_index ? '-' : this.dataset.index + 1;
|
||||||
$pager.find('span.oe_pager_index').html(index);
|
$pager.find('span.oe_pager_index').html(index);
|
||||||
$pager.find('span.oe_pager_count').html(this.dataset.count);
|
$pager.find('span.oe_pager_count').html(this.dataset.ids.length);
|
||||||
},
|
},
|
||||||
do_onchange: function(widget, processed) {
|
do_onchange: function(widget, processed) {
|
||||||
processed = processed || [];
|
processed = processed || [];
|
||||||
|
@ -347,7 +347,6 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV
|
||||||
this.dataset.ids.unshift(this.datarecord.id);
|
this.dataset.ids.unshift(this.datarecord.id);
|
||||||
this.dataset.index = 0;
|
this.dataset.index = 0;
|
||||||
}
|
}
|
||||||
this.dataset.count++;
|
|
||||||
this.do_update_pager();
|
this.do_update_pager();
|
||||||
this.do_update_sidebar();
|
this.do_update_sidebar();
|
||||||
this.notification.notify("Record created", "The record has been created with id #" + this.datarecord.id);
|
this.notification.notify("Record created", "The record has been created with id #" + this.datarecord.id);
|
||||||
|
|
Loading…
Reference in New Issue