Merge lp:~openerp-dev/openerp-web/trunk-improve-m2o-popup-bth into lp:openerp-web

[Bhumi Thakkar (Open ERP)]

Hello,

  Open many2one from one2many on popup and in current page with breadcrumb.

Thanks.

[lp:~openerp-dev/openerp-web/trunk-improve-m2o-popup-bth]

3894. By Mahendra Barad(OpenERP) on 2013-12-30

[IMP]improved m2o from o2m opened on current page and also on popup.

3895. By Mahendra Barad(OpenERP) on 2013-12-30

[REV]revert last changes

3896. By Mahendra Barad(OpenERP) on 2013-12-30

[Merge]Merge with Trunk

Unmerged revisions

3896. By Mahendra Barad(OpenERP) on 2013-12-30

[Merge]Merge with Trunk

3895. By Mahendra Barad(OpenERP) on 2013-12-30

[REV]revert last changes

3894. By Mahendra Barad(OpenERP) on 2013-12-30

[IMP]improved m2o from o2m opened on current page and also on popup.

3893. By Bhumi Thakkar (Open ERP) on 2013-12-12

[IMP]m2o from o2m opened on current page and also on popup.

3892. By Bhumi Thakkar (Open ERP) on 2013-12-12

[MERGE]With Trunk.

3891. By Bhumi Thakkar (Open ERP) on 2013-12-11

[MERGE]With Trunk.

3890. By Bhumi Thakkar (Open ERP) on 2013-12-06

[MERGE]With Trunk.

3889. By Bhumi Thakkar (Open ERP) on 2013-11-21

[IMP]Added comment.

3888. By Bhumi Thakkar (Open ERP) on 2013-11-21

[IMP]Popup raised when m2o from o2m.

3887. By Bhumi Thakkar (Open ERP) on 2013-11-21

[IMP]In readonly mode m2o open in popup instead of current page.

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-12-19 13:40:55 +0000
+++ addons/web/static/src/js/view_form.js	2013-12-30 09:32:48 +0000
@@ -3483,13 +3483,26 @@
                  .html(link);
             if (! this.options.no_open)
                 $link.click(function () {
+                    // Clicked on m2o field from o2m popup
+                    if (self.field_manager.ViewManager.$buttonpane) {
+                        var pop = new instance.web.form.FormOpenPopup(self);
+                        pop.show_element(
+                            self.field.relation,
+                            self.get("value"),
+                            self.build_context(),
+                            {
+                                title: _t("Open: ") + self.string,
+                                readonly: true
+                            }
+                        );
+                    }
                     self.do_action({
                         type: 'ir.actions.act_window',
                         res_model: self.field.relation,
                         res_id: self.get("value"),
                         views: [[false, 'form']],
                         target: 'current',
-                        context: self.build_context().eval(),
+                        context: self.build_context().eval()
                     });
                     return false;
                  });