Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-web-export-fix into lp:openerp-web

  1. trunk-web-export-fix
  2. Merge into trunk
Proposed by Kunal Chavda
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-web-export-fix
Merge into: lp:openerp-web
Diff against target: 206 lines (+55/-28)
3 files modified
addons/web/static/src/css/data_export.css (+25/-1)
addons/web/static/src/js/data_export.js (+15/-11)
addons/web/static/src/xml/base.xml (+15/-16)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-web-export-fix
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+204475@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openerp-web/trunk-web-export-fix updated
3830. By Kunal Chavda

[MERGE]With latest trunk.

3831. By Chirag Dodiya(OpenERP)

[MRG]Merge with lp:openerp-web

3832. By Kunal Chavda

[MERGE]with latest trunk upto 3961revision.

3833. By Ronak Baxi (OpenERP)

[MERGE]with latest trunk upto 3984revision.

3834. By Ronak Baxi (OpenERP)

[IMP]code as per review,convert innerhtml to localeCompare and fix for already stored field list to sorted.

3835. By Ronak Baxi (OpenERP)

[IMP]as per review

3836. By Ronak Baxi (OpenERP)

[IMP]Improvement in Code Indentation

3837. By Ronak Baxi (OpenERP)

[MERGE]with revision no 4002

3838. By Ronak Baxi (OpenERP)

[MERGE]with trunk revno 4018

3839. By Ronak Baxi (OpenERP)

[merge]with 4019

Unmerged revisions

3839. By Ronak Baxi (OpenERP)

[merge]with 4019

3838. By Ronak Baxi (OpenERP)

[MERGE]with trunk revno 4018

3837. By Ronak Baxi (OpenERP)

[MERGE]with revision no 4002

3836. By Ronak Baxi (OpenERP)

[IMP]Improvement in Code Indentation

3835. By Ronak Baxi (OpenERP)

[IMP]as per review

3834. By Ronak Baxi (OpenERP)

[IMP]code as per review,convert innerhtml to localeCompare and fix for already stored field list to sorted.

3833. By Ronak Baxi (OpenERP)

[MERGE]with latest trunk upto 3984revision.

3832. By Kunal Chavda

[MERGE]with latest trunk upto 3961revision.

3831. By Chirag Dodiya(OpenERP)

[MRG]Merge with lp:openerp-web

3830. By Kunal Chavda

[MERGE]With latest trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/css/data_export.css'
2--- addons/web/static/src/css/data_export.css 2013-12-02 13:19:43 +0000
3+++ addons/web/static/src/css/data_export.css 2014-05-23 11:21:43 +0000
4@@ -1,6 +1,24 @@
5 .openerp .oe_export {
6 width: 100%;
7 }
8+.openerp .oe_export_padding {
9+ padding: 10px 20px 0;
10+}
11+
12+.openerp .oe_export_left_padding {
13+ padding: 10px 0 0 20px;
14+ font-weight: bold;
15+}
16+
17+.openerp .oe_export_right_padding {
18+ padding: 10px 20px 0 0;
19+ font-weight: bold;
20+}
21+
22+.openerp .oe_export_left_padding.oe_export_options {
23+ font-weight: normal !important;
24+}
25+
26 /* Customize according bootstrap3 */
27 .openerp .oe_export label {
28 font-weight: normal;
29@@ -29,6 +47,7 @@
30 }
31
32 .openerp .oe_export_fields_selector_left {
33+ padding-left: 20px;
34 width: 50%;
35 }
36
37@@ -44,14 +63,19 @@
38
39 .openerp .oe_export_fields_selector_center {
40 text-align: center;
41+ vertical-align: middle;
42 }
43 .openerp .oe_export_fields_selector_center button {
44 white-space: nowrap;
45+ margin: 0 10px 5px 10px;
46+ width: 90px;
47+ padding: 3px 8px;
48 }
49
50 .openerp .oe_export_fields_selector_right {
51 width: 45%;
52 height: 400px;
53+ padding-right: 20px;
54 }
55
56 .openerp .oe_export_fields_selector_right select{
57@@ -72,7 +96,7 @@
58 border: 1px solid #E3E3E3;
59 text-align: left;
60 white-space: nowrap;
61- background-color:#E3E3E3;
62+ background-color: #E3E3E3;
63 border-collapse: collapse;
64 width: 100%;
65 }
66
67=== modified file 'addons/web/static/src/js/data_export.js'
68--- addons/web/static/src/js/data_export.js 2014-04-30 11:56:50 +0000
69+++ addons/web/static/src/js/data_export.js 2014-05-23 11:21:43 +0000
70@@ -49,7 +49,6 @@
71
72 var got_fields = new $.Deferred();
73 this.$el.find('#import_compat').change(function() {
74- self.$el.find('#fields_list').empty();
75 self.$el.find('#field-tree-structure').remove();
76 var import_comp = self.$el.find("#import_compat").val();
77 self.rpc("/web/export/get_fields", {
78@@ -102,10 +101,10 @@
79 return this.exports.read_slice(['name'], {
80 domain: [['resource', '=', this.dataset.model]]
81 }).done(function (export_list) {
82+ self.$el.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list}));
83 if (!export_list.length) {
84- return;
85+ self.$el.find('#ExistsExportList').hide();
86 }
87- self.$el.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list}));
88 self.$el.find('#saved_export_list').change(function() {
89 self.$el.find('#fields_list option').remove();
90 var export_id = self.$el.find('#saved_export_list option:selected').val();
91@@ -131,6 +130,10 @@
92 _(field_list).each(function (field) {
93 export_node.append(new Option(field.label, field.name));
94 });
95+ export_node.find("option").sort(function (a, b) {
96+ return $(a).text().localeCompare($(b).text())
97+ }).appendTo(export_node);
98+
99 },
100 on_show_save_list: function() {
101 var self = this;
102@@ -166,14 +169,12 @@
103 export_fields: _(fields).map(function (field) {
104 return [0, 0, {name: field}];
105 })
106- }).then(function (export_list_id) {
107- if (!export_list_id) {
108- return;
109- }
110- if (!self.$el.find("#saved_export_list").length || self.$el.find("#saved_export_list").is(":hidden")) {
111- self.show_exports_list();
112- }
113- self.$el.find("#saved_export_list").append( new Option(value, export_list_id) );
114+ }).done(function (export_list_id) {
115+ if (self.$el.find("#saved_export_list").is(":hidden")) {
116+ self.$el.find('#ExistsExportList').show();
117+ }
118+ self.$el.find("#saved_export_list").append(
119+ new Option(value, export_list_id));
120 });
121 this.on_show_save_list();
122 },
123@@ -372,6 +373,9 @@
124 && !this.$el.find("#fields_list option[value='" + field_id + "']").length) {
125 field_list.append(new Option(string, field_id));
126 }
127+ field_list.find("option").sort(function (a, b) {
128+ return $(a).text().localeCompare($(b).text())
129+ }).appendTo(field_list);
130 },
131 get_fields: function() {
132 var export_fields = this.$("#fields_list option").map(function() {
133
134=== modified file 'addons/web/static/src/xml/base.xml'
135--- addons/web/static/src/xml/base.xml 2014-05-08 15:34:18 +0000
136+++ addons/web/static/src/xml/base.xml 2014-05-23 11:21:43 +0000
137@@ -1788,13 +1788,13 @@
138 <table t-name="ExportTreeView" class="oe_export"
139 style="background-color: #F3F3F3;">
140 <tr>
141- <td colspan="3">
142+ <td colspan="3" class="oe_export_padding">
143 This wizard will export all data that matches the current search criteria to a CSV file.
144 You can export all data or only the fields that can be reimported after modification.
145 </td>
146 </tr>
147 <tr>
148- <td colspan="3">
149+ <td colspan="2" class="oe_export_left_padding oe_export_options">
150 <label for="import_compat">Export Type:</label>
151 <select id="import_compat" name="import_compat">
152 <option value="yes">Import-Compatible Export</option>
153@@ -1804,17 +1804,19 @@
154 <label for="export_format">Export Formats</label>
155 <select id="export_format" name="export_format"></select>
156 </td>
157+ <td class="oe_export_right_padding">
158+ <div id="ExistsExportList"></div>
159+ </td>
160 </tr>
161
162 <tr>
163- <th>Available fields</th>
164- <th/>
165- <th>
166+ <td class="oe_export_left_padding">Available fields</td>
167+ <td/>
168+ <td class="oe_export_right_padding">
169 Fields to export
170 <a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
171 <div id="savenewlist"></div>
172- <div id="ExistsExportList"></div>
173- </th>
174+ </td>
175 </tr>
176 <tr style="height: 400px;">
177 <td class="oe_export_fields_selector_left">
178@@ -1822,10 +1824,9 @@
179 </div>
180 </td>
181 <td class="oe_export_fields_selector_center">
182- <!-- TODO: replace ids by 'oe_*' classes -->
183- <button class="oe_button" id="add_field">Add</button>
184- <button class="oe_button" id="remove_field">Remove</button>
185- <button class="oe_button" id="remove_all_field">Remove All</button>
186+ <button id="add_field">Add</button>
187+ <button id="remove_field">Remove</button>
188+ <button id="remove_all_field">Remove All</button>
189 </td>
190 <td class="oe_export_fields_selector_right">
191 <select name="fields_list" id="fields_list"
192@@ -1875,11 +1876,9 @@
193 </td>
194 </tr>
195 <t t-name="ExportNewList">
196- <tr>
197- <th><label>Save as:</label></th>
198- <td><input size="10" type="text" id="savelist_name"/></td>
199- <td><button class="oe_button oe_export_button_export" id="add_export_list">Ok</button></td>
200- </tr>
201+ <label for="savelist_name">Save as:</label>
202+ <input size="10" type="text" id="savelist_name"/>
203+ <button class="oe_button oe_export_button_export" id="add_export_list">Ok</button>
204 </t>
205 <t t-name="Exists.ExportList">
206 <label for="saved_export_list">Saved exports:</label>