Merge lp:~openerp-dev/openerp-web/7.0-opw-594708-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of last element of grouped row removed instead of removing span and buttons.

Demo:- Open any list view and do grouping such that on grouped row we get pager, now just expand and collapse that row, the row grouped value(which is some of childrens) removed for last element.
For example goto Reporting -> Point of Sale -> Order Analysis -> Group on Sales Person only.
Now just expand(we will get pager on last element) and collapse the grouped row(removed last element).

Thanks.

[lp:~openerp-dev/openerp-web/7.0-opw-594708-msh]

3994. By Launchpad Translations on behalf of openerp on 2013-07-05

Launchpad automatic translations update.

3995. By Launchpad Translations on behalf of openerp on 2013-07-12

Launchpad automatic translations update.

3996. By Launchpad Translations on behalf of openerp on 2013-07-13

Launchpad automatic translations update.

3997. By Launchpad Translations on behalf of openerp on 2013-07-14

Launchpad automatic translations update.

3998. By Launchpad Translations on behalf of openerp on 2013-07-15

Launchpad automatic translations update.

3999. By Nicolas Vanhoren (OpenERP) on 2013-07-15

[FIX] problem with werkzeug 0.9.1 that makes the code crash when we generate a report

4000. By Nicolas Vanhoren (OpenERP) on 2013-07-16

[FIX] some more problems with werkzeug 0.9.1

4001. By Launchpad Translations on behalf of openerp on 2013-07-17

Launchpad automatic translations update.

4002. By Launchpad Translations on behalf of openerp on 2013-07-18

Launchpad automatic translations update.

4003. By Paramjit Singh Sahota <email address hidden> on 2013-07-19

[FIX] web_calendar: do not generate invalid domain if views does not specify a "date_stop" field

4004. By Launchpad Translations on behalf of openerp on 2013-07-22

Launchpad automatic translations update.

4005. By Nicolas Vanhoren (OpenERP) on 2013-07-24

[FIX] some crash in the view manager

4006. By Launchpad Translations on behalf of openerp on 2013-07-29

Launchpad automatic translations update.

4007. By Launchpad Translations on behalf of openerp on 2013-07-30

Launchpad automatic translations update.

4008. By Launchpad Translations on behalf of openerp on 2013-08-06

Launchpad automatic translations update.

4009. By Launchpad Translations on behalf of openerp on 2013-08-09

Launchpad automatic translations update.

4010. By Launchpad Translations on behalf of openerp on 2013-08-10

Launchpad automatic translations update.

4011. By Launchpad Translations on behalf of openerp on 2013-08-11

Launchpad automatic translations update.

4012. By Nicolas Vanhoren (OpenERP) on 2013-08-13

[FIX] remove last password saving feature

4013. By Launchpad Translations on behalf of openerp on 2013-08-15

Launchpad automatic translations update.

4014. By Martin Trigaux (OpenERP) on 2013-08-21

[FIX] vertical alignment of fields on firefox (opw #590181)

4015. By Martin Trigaux (OpenERP) on 2013-08-21

[MERGE] [FIX] reload form if button has option reload_on_button

4016. By Launchpad Translations on behalf of openerp on 2013-08-22

Launchpad automatic translations update.

4017. By Launchpad Translations on behalf of openerp on 2013-08-23

Launchpad automatic translations update.

4018. By Martin Trigaux (OpenERP) on 2013-08-23

[FIX] tree view: correct toggeling of hierarchic tree, correctly pass ids

4019. By Launchpad Translations on behalf of openerp on 2013-08-25

Launchpad automatic translations update.

4020. By Launchpad Translations on behalf of openerp on 2013-08-26

Launchpad automatic translations update.

4021. By Martin Trigaux (OpenERP) on 2013-08-29

[FIX] tree views: rename variable parent-id to avoid conflicts with record fields name (eg: account.account)

4022. By Launchpad Translations on behalf of openerp on 2013-08-30

Launchpad automatic translations update.

4023. By Launchpad Translations on behalf of openerp on 2013-09-02

Launchpad automatic translations update.

4024. By Launchpad Translations on behalf of openerp on 2013-09-04

Launchpad automatic translations update.

4025. By Launchpad Translations on behalf of openerp on 2013-09-05

Launchpad automatic translations update.

4026. By Launchpad Translations on behalf of openerp on 2013-09-06

Launchpad automatic translations update.

4027. By Martin Trigaux (OpenERP) on 2013-09-09

[MERGE] [FIX] pass context for 2many fields in views

4028. By Launchpad Translations on behalf of openerp on 2013-09-15

Launchpad automatic translations update.

4029. By Launchpad Translations on behalf of openerp on 2013-09-19

Launchpad automatic translations update.

4030. By Denis Ledoux (OpenERP) on 2013-09-19

[FIX]web base: when kanban view was setted after the tree view in the views sequence, the form view was located in the footer of the web page.

4031. By Launchpad Translations on behalf of openerp on 2013-09-20

Launchpad automatic translations update.

4032. By Launchpad Translations on behalf of openerp on 2013-09-22

Launchpad automatic translations update.

4033. By Launchpad Translations on behalf of openerp on 2013-09-28

Launchpad automatic translations update.

4034. By Launchpad Translations on behalf of openerp on 2013-10-04

Launchpad automatic translations update.

4035. By Launchpad Translations on behalf of openerp on 2013-10-13

Launchpad automatic translations update.

4036. By Xavier (Open ERP) on 2013-10-14

[FIX] null >= 0 is true...

4037. By Xavier (Open ERP) on 2013-10-15

[FIX] double-escaping of section labels in m2o completion

4038. By Nicolas Vanhoren (OpenERP) on 2013-10-16

[IMP] enabled sorting in o2m in list view

4039. By Launchpad Translations on behalf of openerp on 2013-10-18

Launchpad automatic translations update.

4040. By Launchpad Translations on behalf of openerp on 2013-10-20

Launchpad automatic translations update.

4041. By Launchpad Translations on behalf of openerp on 2013-10-22

Launchpad automatic translations update.

4042. By Denis Ledoux (OpenERP) on 2013-10-22

[FIX]web: filter name input for custom filters in search dropdown is now required

4043. By Denis Ledoux (OpenERP) on 2013-10-22

[FIX]web: test testing the customer filter save was wrong, was using wrong method text() instead of val() to set the filter name

4044. By Launchpad Translations on behalf of openerp on 2013-10-24

Launchpad automatic translations update.

4045. By xmo on 2013-10-25

[FIX] list view: serialize concurrent calls when loading files and ensure consistency of variables (prevent selection of items in list view lost, opw #599969)

4046. By Launchpad Translations on behalf of openerp on 2013-10-26

Launchpad automatic translations update.

4047. By Launchpad Translations on behalf of openerp on 2013-10-27

Launchpad automatic translations update.

4048. By Martin Trigaux (OpenERP) on 2013-10-28

[FIX] list: force to recompute the selection as closing group reset items and would lead to an incorrect count of ids (eg: not hidding sidebar when no item is selected) (opw #599969)

4049. By Christophe Simonis (OpenERP) on 2013-10-30

[FIX] web: allow grouping on fields not present in list view
[FIX] web,web_kanban: read_group: ensure read grouping fields

4050. By Launchpad Translations on behalf of openerp on 2013-11-01

Launchpad automatic translations update.

4051. By Launchpad Translations on behalf of openerp on 2013-11-02

Launchpad automatic translations update.

4052. By Launchpad Translations on behalf of openerp on 2013-11-03

Launchpad automatic translations update.

4053. By Launchpad Translations on behalf of openerp on 2013-11-04

Launchpad automatic translations update.

4054. By Christophe Simonis (OpenERP) on 2013-11-04

[FIX] web_kanban: correct design of vertical title on IE

4055. By Christophe Simonis (OpenERP) on 2013-11-05

[FIX] web: instance.web.DataSetSearch.get_domain() returns the domain.

4056. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-11-06

[FIX]Re-fixed the issue of pager on group by view, last element of the row removes total value.

[Mohammed Shekha(Open ERP) (msh-openerp)]

Hello,

Also fixed the issue of aggregate value removed when group row has only one page and it is expanded.

Demo: Goto any list view, do grouping on any fiels so that it returns less then 80 records per group, as there is only one page so there is no need of pager so we removed 'td.oe_list_group_pagination'(we make whole td empty) so it will also remove aggregate amount value also.

We should only remove button and span not all td value.

Thanks.

[Martin Trigaux (OpenERP) (mat-openerp)]

Thanks for the patch, merged in web 7.0

revno: 4093 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2013-10-30 18:02:42 +0000
+++ addons/web/static/src/js/view_list.js	2013-11-06 13:50:16 +0000
@@ -1284,7 +1284,8 @@
         }
     },
     close: function () {
-        this.$row.children().last().empty();
+        this.$row.children().last().find('button').remove();
+        this.$row.children().last().find('span').remove();
         this.records.reset();
     },
     /**
@@ -1456,7 +1457,8 @@
                 } else {
                     if (dataset.size() == records.length) {
                         // only one page
-                        self.$row.find('td.oe_list_group_pagination').empty();
+                        self.$row.find('td.oe_list_group_pagination').find('button').remove();
+                        self.$row.find('td.oe_list_group_pagination').find('span').remove();
                     } else {
                         var pages = Math.ceil(dataset.size() / limit);
                         self.$row