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

[IMP] web, web_diagram: improve code formatting 

bzr revid: rco@openerp.com-20120904145017-qw6n8clak9byw1w3
This commit is contained in:
Raphael Collet 2012-09-04 16:50:17 +02:00
parent bf20cd7018
commit d6dc264ea2
4 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,15 +252,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
this.$el.addClass(this.fields_view.arch.attrs['class']);
// add css classes that reflect the (absence of) access rights
if (!this.is_action_enabled('create')) {
this.$el.addClass('oe_list_cannot_create');
}
if (!this.is_action_enabled('edit')) {
this.$el.addClass('oe_list_cannot_edit');
}
if (!this.is_action_enabled('delete')) {
this.$el.addClass('oe_list_cannot_delete');
}
this.$el.toggleClass('oe_list_cannot_create', !this.is_action_enabled('create'))
.toggleClass('oe_list_cannot_edit', !this.is_action_enabled('edit'))
.toggleClass('oe_list_cannot_delete', !this.is_action_enabled('delete'));
// Head hook
// Selecting records

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

@ -1364,7 +1364,8 @@ instance.web.View = instance.web.Widget.extend({
* like: <form string="" create="false" edit="false" delete="false">
*/
is_action_enabled: function(action) {
return (_.has(this.fields_view.arch.attrs, action)) ? JSON.parse(this.fields_view.arch.attrs[action]) : true;
var attrs = this.fields_view.arch.attrs;
return (action in attrs) ? JSON.parse(attrs[action]) : true;
}
});

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

@ -725,14 +725,12 @@
<div t-name="FormView.buttons" class="oe_form_buttons">
<t t-if="widget.options.action_buttons !== false">
<span class="oe_form_buttons_view">
<t t-if="widget.is_action_enabled('edit')">
<div style="display: inline-block;"> <!-- required for the bounce effect on button -->
<button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
</div>
</t>
<t t-if="widget.is_action_enabled('create')">
<button type="button" class="oe_button oe_form_button_create" accesskey="C">Create</button>
</t>
<!-- required for the bounce effect on button -->
<div t-if="widget.is_action_enabled('edit')" style="display: inline-block;">
<button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
</div>
<button t-if="widget.is_action_enabled('create')"
type="button" class="oe_button oe_form_button_create" accesskey="C">Create</button>
</span>
<span class="oe_form_buttons_edit">
<button type="button" class="oe_button oe_form_button_save oe_highlight" accesskey="S">Save</button>

10
addons/web_diagram/static/src/xml/base_diagram.xml
View File

@ -1,12 +1,10 @@
<template>
<t t-name="DiagramView">
<div class="oe_diagram_header" t-att-id="element_id + '_header'">
<div class="oe_diagram_header" t-att-id="widget.element_id + '_header'">
<h3 class="oe_diagram_title"/>
<t t-if="widget.is_action_enabled('create')">
<div class="oe_diagram_buttons">
<button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
</div>
</t>
<div t-if="widget.is_action_enabled('create')" class="oe_diagram_buttons">
<button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
</div>
<div class="oe_diagram_pager">
<t t-call="ViewPager">
<span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>