Merge lp:~openerp-dev/openerp-web/6.1-opw-581018-cpa into lp:openerp-web/6.1

Proposed by Chirag Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/6.1-opw-581018-cpa
Merge into: lp:openerp-web/6.1
Diff against target: 21 lines (+7/-0)
1 file modified
addons/web/static/src/js/view_form.js (+7/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/6.1-opw-581018-cpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+132850@code.launchpad.net

Description of the change

Hello,

Notebook all page hidden but last page content display.

If we have attrs that set invisible on some condition the pages of notebook and all pages are hidden.

When open form view, it will display the content of last hidden page.
All page should be hidden.

Thanks.

To post a comment you must log in.

Unmerged revisions

2474. By Chirag Patel (OpenERP)

[FIX] Fixed minor changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2012-10-23 07:30:10 +0000
+++ addons/web/static/src/js/view_form.js 2012-11-05 09:12:22 +0000
@@ -1233,10 +1233,17 @@
1233 this._super.apply(this, arguments);1233 this._super.apply(this, arguments);
1234 this.$element_tab = this.notebook.$element.find(1234 this.$element_tab = this.notebook.$element.find(
1235 '> ul > li:eq(' + this.index + ')');1235 '> ul > li:eq(' + this.index + ')');
1236 this.$element_page_div = this.notebook.$element.find(
1237 '> div:eq(' + this.index + ')');
1236 },1238 },
1237 update_dom: function() {1239 update_dom: function() {
1238 if (this.invisible && this.index === this.notebook.$element.tabs('option', 'selected')) {1240 if (this.invisible && this.index === this.notebook.$element.tabs('option', 'selected')) {
1239 this.notebook.do_select_first_visible_tab();1241 this.notebook.do_select_first_visible_tab();
1242 this.$element_page_div.addClass('ui-tabs-hide');
1243 } else {
1244 if (this.$element_tab.hasClass("ui-state-active")){
1245 this.$element_page_div.removeClass('ui-tabs-hide');
1246 }
1240 }1247 }
1241 this.$element_tab.toggle(!this.invisible);1248 this.$element_tab.toggle(!this.invisible);
1242 this.$element.toggle(!this.invisible);1249 this.$element.toggle(!this.invisible);