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

listview refactor part2 

bzr revid: al@openerp.com-20120409201647-97r7h4nd3lid42si
This commit is contained in:
Antony Lesuisse 2012-04-09 22:16:47 +02:00
parent 63e14ebeaa
commit 16ea7ae148
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/static/src/js/view_form.js
View File

@ -78,10 +78,10 @@ openerp.web.FormView = openerp.web.View.extend({
this.$pager = this.options.$pager || this.$element.find('.oe_form_pager'); this.$pager = this.options.$pager || this.$element.find('.oe_form_pager');
this.$buttons.html(QWeb.render("FormView.buttons", {'widget':self})); this.$buttons.html(QWeb.render("FormView.buttons", {'widget':self}));
this.$pager.html(QWeb.render("FormView.pager", {'widget':self}));
this.$buttons.on('click','.oe_form_buttons button.oe_form_button_save',this.on_button_save); this.$buttons.on('click','.oe_form_buttons button.oe_form_button_save',this.on_button_save);
this.$buttons.on('click','.oe_form_buttons button.oe_form_button_cancel',this.on_button_cancel); this.$buttons.on('click','.oe_form_buttons button.oe_form_button_cancel',this.on_button_cancel);
this.$pager.html(QWeb.render("FormView.pager", {'widget':self}));
this.$pager.on('click','.oe_form_pager button[data-pager-action]',function(event) { this.$pager.on('click','.oe_form_pager button[data-pager-action]',function(event) {
var action = $(this).data('pager-action'); var action = $(this).data('pager-action');
self.on_pager_action(action); self.on_pager_action(action);

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

@ -232,12 +232,14 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
// Add and delete // Add and delete
this.$buttons = this.options.$buttons || this.$element.find('.oe_list_buttons'); this.$buttons = this.options.$buttons || this.$element.find('.oe_list_buttons');
this.$element.find('.oe-list-add') .click(this.proxy('do_add_record')) .attr('disabled', grouped && this.options.editable); this.$buttons.html(QWeb.render("ListView.buttons", {'widget':self}));
this.$element.find('.oe-list-delete') .attr('disabled', true) .click(this.proxy('do_delete_selected')); this.$buttons.find('.oe_list_add') .click(this.proxy('do_add_record')) .attr('disabled', grouped && this.options.editable);
this.$buttons.find('.oe_list_delete') .attr('disabled', true) .click(this.proxy('do_delete_selected'));
// Pager // Pager
this.$pager = this.options.$pager || this.$element.find('.oe_list_pager'); this.$pager = this.options.$pager || this.$element.find('.oe_list_pager');
this.$element.find('.oe-list-pager') this.$pager.html(QWeb.render("FormView.pager", {'widget':self}));
this.$pager.find('.oe_list_pager')
.delegate('button', 'click', function () { .delegate('button', 'click', function () {
var $this = $(this); var $this = $(this);
switch ($this.data('pager-action')) { switch ($this.data('pager-action')) {
@ -478,7 +480,6 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
reload: function () { reload: function () {
return this.reload_content(); return this.reload_content();
}, },
do_load_state: function(state, warm) { do_load_state: function(state, warm) {
var reload = false; var reload = false;
if (state.page && this.page !== state.page) { if (state.page && this.page !== state.page) {
@ -543,7 +544,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
* @param {Array} records selected record values * @param {Array} records selected record values
*/ */
do_select: function (ids, records) { do_select: function (ids, records) {
this.$element.find('.oe-list-delete').attr('disabled', !ids.length); this.$buttons.find('.oe_list_delete').attr('disabled', !ids.length);
if (!ids.length) { if (!ids.length) {
this.dataset.index = 0; this.dataset.index = 0;
if (this.sidebar) { if (this.sidebar) {

10
addons/web/static/src/xml/base.xml
View File

@ -595,17 +595,17 @@
</tfoot> </tfoot>
</table> </table>
<t t-name="ListView.buttons"> <t t-name="ListView.buttons">
<div t-if="!no_leaf and options.action_buttons !== false" class="oe_list_buttons"> <div t-if="!widget.no_leaf and widget.options.action_buttons !== false" class="oe_list_buttons">
<button type="button" class="oe_button oe-list-add" t-if="options.addable"> <button type="button" class="oe_button oe_list_add" t-if="widget.options.addable">
<t t-esc="options.addable"/> <t t-esc="widget.options.addable"/>
</button> </button>
<button type="button" class="oe_button oe-list-delete" t-if="options.selectable and options.deletable"> <button type="button" class="oe_button oe_list_delete" t-if="widget.options.selectable and widget.options.deletable">
Delete Delete
</button> </button>
</div> </div>
</t> </t>
<t t-name="Listview.pager"> <t t-name="Listview.pager">
<div t-if="!no_leaf and options.pager !== false" class="oe-list-pager" t-att-colspan="columns_count"> <div t-if="!widget.no_leaf and widget.options.pager !== false" class="oe_list_pager" t-att-colspan="widget.columns_count">
<t t-call="ViewPager"> <t t-call="ViewPager">
<span class="oe-pager-state"> <span class="oe-pager-state">
</span> </span>