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

[FIX] Fixed dashboards 

bzr revid: fme@openerp.com-20120410135537-54gonhjz3gfw9a4r
This commit is contained in:
Fabien Meghazi 2012-04-10 15:55:37 +02:00
parent 1667e6319f
commit d9e194be04
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,8 +81,7 @@ openerp.web.FormView = openerp.web.View.extend({
this.$sidebar = this.options.$sidebar || this.$element.find('.oe_form_sidebar'); this.$sidebar = this.options.$sidebar || this.$element.find('.oe_form_sidebar');
var buttons_html = QWeb.render("FormView.buttons", {'widget':self}); this.$buttons = $(QWeb.render("FormView.buttons", {'widget':self}));
this.$buttons = $(_.str.isBlank(buttons_html) ? '<div>' : buttons_html);
if (this.options.$buttons) { if (this.options.$buttons) {
this.$buttons.appendTo(this.options.$buttons); this.$buttons.appendTo(this.options.$buttons);
} else { } else {
@ -96,8 +95,7 @@ openerp.web.FormView = openerp.web.View.extend({
.on('click','button.oe_form_button_duplicate',this.on_button_duplicate) .on('click','button.oe_form_button_duplicate',this.on_button_duplicate)
.on('click','button.oe_form_button_delete',this.on_button_delete); .on('click','button.oe_form_button_delete',this.on_button_delete);
var pager_html = QWeb.render("FormView.pager", {'widget':self}); this.$pager = $(QWeb.render("FormView.pager", {'widget':self}));
this.$pager = $(_.str.isBlank(pager_html) ? '<div>' : pager_html);
if (this.options.$pager) { if (this.options.$pager) {
this.$pager.appendTo(this.options.$pager); this.$pager.appendTo(this.options.$pager);
} else { } else {

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

@ -600,19 +600,19 @@
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
<t t-name="ListView.buttons"> <div t-name="ListView.buttons" class="oe_list_buttons">
<div t-if="!widget.no_leaf and widget.options.action_buttons !== false" class="oe_list_buttons"> <t t-if="!widget.no_leaf and widget.options.action_buttons !== false">
<button type="button" class="oe_button oe_list_add" t-if="widget.options.addable"> <button type="button" class="oe_button oe_list_add" t-if="widget.options.addable">
<t t-esc="widget.options.addable"/> <t t-esc="widget.options.addable"/>
</button> </button>
<button type="button" class="oe_button oe_list_delete" t-if="widget.options.selectable and widget.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> </t>
</t> </div>
<t t-name="ListView.pager"> <t t-name="ListView.pager">
<div t-if="!widget.no_leaf and widget.options.pager !== false" class="oe_list_pager" t-att-colspan="widget.columns_count"> <div class="oe_list_pager" t-att-colspan="widget.columns_count">
<t t-call="ViewPager"> <t t-if="!widget.no_leaf and widget.options.pager !== false" t-call="ViewPager">
<span class="oe-pager-state"> <span class="oe-pager-state">
</span> </span>
</t> </t>
@ -681,8 +681,8 @@
<div class="oe_form_container"/> <div class="oe_form_container"/>
</div> </div>
</t> </t>
<t t-name="FormView.buttons"> <div t-name="FormView.buttons" class="oe_form_buttons">
<div class="oe_form_buttons" t-if="widget.options.action_buttons !== false"> <t t-if="widget.options.action_buttons !== false">
<span class="oe_form_buttons_view"> <span class="oe_form_buttons_view">
<button type="button" class="oe_button oe_form_button_edit">Edit</button> <button type="button" class="oe_button oe_form_button_edit">Edit</button>
<button type="button" class="oe_button oe_form_button_create">Create</button> <button type="button" class="oe_button oe_form_button_create">Create</button>
@ -693,11 +693,11 @@
<button type="button" class="oe_button oe_form_button_save">Save</button> <button type="button" class="oe_button oe_form_button_save">Save</button>
<button type="button" class="oe_button oe_form_button_cancel">Cancel</button> <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
</span> </span>
</div> </t>
</t> </div>
<t t-name="FormView.pager"> <t t-name="FormView.pager">
<div class="oe_form_pager" t-if="widget.options.pager !== false"> <div class="oe_form_pager">
<t t-call="ViewPager"> <t t-if="widget.options.pager !== false" t-call="ViewPager">
<span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span> <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
</t> </t>
</div> </div>