Merge lp:~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute into lp:openerp-web/7.0

Proposed by Stefan Rijnhart (Opener)
Status: Needs review
Proposed branch: lp:~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute
Merge into: lp:openerp-web/7.0
Diff against target: 66 lines (+18/-2)
3 files modified
addons/web/static/src/css/base.css (+6/-0)
addons/web/static/src/css/base.sass (+9/-0)
addons/web/static/src/js/view_form.js (+3/-2)
To merge this branch: bzr merge lp:~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, test Approve
OpenERP Core Team Pending
Review via email: mp+156310@code.launchpad.net

Description of the change

This branch, from August 2012 was approved by Xavier in November 2012 (see [1]) but that MP was against trunk and has now conflicts. I am resubmitting against 7.0 here.

[1] https://code.launchpad.net/~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute/+merge/116238

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

works fine (in OCB branch)

review: Approve (code review, test)

Unmerged revisions

2755. By Stefan Rijnhart (Opener)

[MRG] merged with lp:openerp-web/7.0 revno 3872

2754. By Stefan Rijnhart (Opener)

[MRG] merged with lp:openerpweb revno 2863 to resolve conflict in merge proposal

2753. By Stefan Rijnhart (Opener)

[FIX] Remove redundant check containing an invalid keyword
[FIX] Move css modifications to sass file

2752. By Stefan Rijnhart (Opener)

[ADD] Support for required *2many fields, including visual hints

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2013-03-21 16:47:41 +0000
+++ addons/web/static/src/css/base.css 2013-03-31 17:14:24 +0000
@@ -2059,6 +2059,12 @@
2059 position: relative;2059 position: relative;
2060 display: inline-block;2060 display: inline-block;
2061}2061}
2062.openerp .oe_form_editable .oe_form_required.oe_form_field_one2many table.oe_list_content, .openerp .oe_form_editable .oe_form_required.oe_form_field_many2many table.oe_list_content {
2063 background-color: #d2d2ff !important;
2064}
2065.openerp .oe_form_editable .oe_form_invalid.oe_form_field_one2many table.oe_list_content, .openerp .oe_form_editable .oe_form_invalid.oe_form_field_many2many table.oe_list_content {
2066 background-color: #ff6666 !important;
2067}
2062.openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea {2068.openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea {
2063 background-color: #ff6666 !important;2069 background-color: #ff6666 !important;
2064 border: 1px solid #dd0000 !important;2070 border: 1px solid #dd0000 !important;
20652071
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2013-03-21 16:47:41 +0000
+++ addons/web/static/src/css/base.sass 2013-03-31 17:14:24 +0000
@@ -1647,6 +1647,15 @@
1647 .oe_form_dropdown_section1647 .oe_form_dropdown_section
1648 position: relative1648 position: relative
1649 display: inline-block1649 display: inline-block
1650 .oe_form_editable
1651 .oe_form_required
1652 &.oe_form_field_one2many, &.oe_form_field_many2many
1653 table.oe_list_content
1654 background-color: #d2d2ff !important
1655 .oe_form_invalid
1656 &.oe_form_field_one2many, &.oe_form_field_many2many
1657 table.oe_list_content
1658 background-color: #ff6666 !important
1650 .oe_form_invalid1659 .oe_form_invalid
1651 input, select, textarea1660 input, select, textarea
1652 background-color: #F66 !important1661 background-color: #F66 !important
16531662
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2013-03-28 21:07:18 +0000
+++ addons/web/static/src/js/view_form.js 2013-03-31 17:14:24 +0000
@@ -3459,7 +3459,6 @@
3459};3459};
3460instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({3460instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
3461 multi_selection: false,3461 multi_selection: false,
3462 disable_utility_classes: true,
3463 init: function(field_manager, node) {3462 init: function(field_manager, node) {
3464 this._super(field_manager, node);3463 this._super(field_manager, node);
3465 lazy_build_o2m_kanban_view();3464 lazy_build_o2m_kanban_view();
@@ -3729,6 +3728,9 @@
3729 }3728 }
3730 return $.when(false);3729 return $.when(false);
3731 },3730 },
3731 is_false: function() {
3732 return this.dataset.ids.length == 0;
3733 },
3732 is_syntax_valid: function() {3734 is_syntax_valid: function() {
3733 if (! this.viewmanager || ! this.viewmanager.views[this.viewmanager.active_view])3735 if (! this.viewmanager || ! this.viewmanager.views[this.viewmanager.active_view])
3734 return true;3736 return true;
@@ -4222,7 +4224,6 @@
4222*/4224*/
4223instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {4225instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
4224 multi_selection: false,4226 multi_selection: false,
4225 disable_utility_classes: true,
4226 init: function(field_manager, node) {4227 init: function(field_manager, node) {
4227 this._super(field_manager, node);4228 this._super(field_manager, node);
4228 this.is_loaded = $.Deferred();4229 this.is_loaded = $.Deferred();