← Back to branch summary

~unifield-team/unifield-web/utp-580-582-697-web

« back to all changes in this revision

Viewing changes to addons/openerp/controllers/templates/exp.mako

  • Committer: jf
  • Date: 2013-10-21 15:05:07 UTC
  • mfrom: (4719.1.2 unifield-web)
  • Revision ID: jfb@tempo-consulting.fr-20131021150507-mbntp4p3sxukozh6
UTP-504 [FIX] Export fields list save gives a python error (but the fields list is nevertheless saved)
lp:~unifield-team/unifield-web/utp-504

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/openerp/controllers/templates/exp.mako
43
43
            var form = document.forms['view_form'];
44
44
            form.action = '/openerp/impex/save_exp';
45
45
            var options = openobject.dom.get('fields').options;
 
46
            var fields2 = [];
46
47
            forEach(options, function(o){
47
48
                o.selected = true;
 
49
                fields2 = fields2.concat('"' + o.text + '"');
48
50
            });
 
51
            openobject.dom.get('_terp_fields2').value = '[' + fields2.join(',') + ']';
49
52
            form.submit();
50
53
        }
51
54
 
115
118
 
116
119
            if (options.length == 0){
117
120
                error_display(_('Please select fields to export...'));
118
 
                return;
 
121
                return 0;
119
122
            }
120
123
 
121
124
            var fields2 = [];
128
131
        }
129
132
 
130
133
        function do_export(form){
131
 
            do_pre_submit();
 
134
            pre = do_pre_submit();
132
135
            if (jQuery('#export_format').val() == 'excel') {
133
136
                file_name = "data.xls";
134
137
            } else {
135
138
                file_name = "data.csv";
136
139
            }
137
 
            jQuery(idSelector(form)).attr('action', openobject.http.getURL(
138
 
                '/openerp/impex/export_data/'+file_name)
139
 
            ).submit();
 
140
            if (pre != 0) {
 
141
                jQuery(idSelector(form)).attr('action', openobject.http.getURL(
 
142
                    '/openerp/impex/export_data/'+file_name)
 
143
                ).submit();
 
144
            }
140
145
 
141
146
        }
142
147
 
243
248
                                        <option value="default">${_('Default view fields')}</option>
244
249
                                    % endif
245
250
                                    % for export in existing_exports:
246
 
                                        <option value="${export['id']}">${export['name']}</option>
 
251
                                        <option value="${export['id']}" ${'selected=selected' if export_id == export['id'] else ''}>${export['name']}</option>
247
252
                                    % endfor
248
253
                                </select>
249
254
                                <a class="button-a" href="#" onclick="delete_listname(); return false;"