Jiten (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-web-need-improvements into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-web-need-improvements/+merge/125429
Here some improvements in code to fix issue which is generated on web.
1) Remove Drag & Drop on page view for o2m sequence like as,
Sales > Products > open page view of any product > open tab of Procurements
> Suppliers
2) In Kanban View when column is folded and than do hover on that than image
for unfold/edit is overlapped on header text and image is not clear visible, so
there header text should be set after image.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-web-need-improvements/+merge/125429
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-web-need-improvements.
=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js 2012-09-16 20:40:29 +0000
+++ addons/web/static/src/js/view_list.js 2012-09-20 08:48:50 +0000
@@ -399,10 +399,14 @@
*/
setup_columns: function (fields, grouped) {
var registry = instance.web.list.columns;
+ var reorder = this.options.reorderable;
this.columns.splice(0, this.columns.length);
this.columns.push.apply(this.columns,
_(this.fields_view.arch.children).map(function (field) {
var id = field.attrs.name;
+ if(field.attrs.widget == 'handle' && !reorder){
+ field.attrs.reorderable = reorder || true;
+ }
return registry.for_(id, fields[id], field);
}));
if (grouped) {
@@ -411,9 +415,8 @@
}
this.visible_columns = _.filter(this.columns, function (column) {
- return column.invisible !== '1';
+ return column.invisible !== '1' && !column.reorderable;
});
-
this.aggregate_columns = _(this.visible_columns).invoke('to_aggregate');
},
/**
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-09-19 11:46:29 +0000
+++ addons/web/static/src/xml/base.xml 2012-09-20 08:48:50 +0000
@@ -630,7 +630,7 @@
<input type="checkbox" class="oe_list_record_selector"/>
</th>
<t t-foreach="columns" t-as="column">
- <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
+ <th t-if="!column.meta and column.invisible !== '1' and !column.reorderable" t-att-data-id="column.id"
t-attf-class="oe_list_header_#{column.widget or column.type} #{((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)}">
<t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t>
</th>
@@ -685,7 +685,7 @@
<t t-foreach="columns" t-as="column">
<t t-set="number" t-value="column.type === 'integer' or column.type == 'float'"/>
<t t-set="modifiers" t-value="column.modifiers_for(asData)"/>
- <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
+ <td t-if="!column.meta and column.invisible !== '1' and !column.reorderable" t-att-title="column.help"
t-attf-class="oe_list_field_cell oe_list_field_#{column.widget or column.type} #{number ? 'oe_number' : ''} #{column.tag === 'button' ? 'oe-button' : ''} #{modifiers.readonly ? 'oe_readonly' : ''} #{modifiers.required ? 'oe_required' : ''}"
t-att-data-field="column.id"
><t t-raw="render_cell(record, column)"/></td>
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css 2012-09-18 17:02:31 +0000
+++ addons/web_kanban/static/src/css/kanban.css 2012-09-20 08:48:50 +0000
@@ -135,7 +135,7 @@
white-space: nowrap;
display: none;
position: relative;
- top: 5px;
+ top: 25px;
}
.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
margin-left: 4px;
=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass 2012-09-18 17:02:31 +0000
+++ addons/web_kanban/static/src/css/kanban.sass 2012-09-20 08:48:50 +0000
@@ -146,7 +146,7 @@
white-space: nowrap
display: none
position: relative
- top: 5px
+ top: 25px
// }}}
// KanbanQuickCreate {{{
.oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
