Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-kanban-document-bth into lp:openerp-web

  1. trunk-kanban-document-bth
  2. Merge into trunk
Proposed by Bhumi Thakkar (Open ERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openerp-web/trunk-kanban-document-bth
Merge into: lp:openerp-web
Diff against target: 119 lines (+26/-20)
3 files modified
addons/web/static/src/js/view_form.js (+5/-3)
addons/web/static/src/xml/base.xml (+5/-15)
addons/web_kanban/static/src/js/kanban.js (+16/-2)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-kanban-document-bth
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+156804@code.launchpad.net

Description of the change

Hello,

        Fixed 2 issues related document or attachment.
=> There is no any file in record still download link is displayed and also if clicked on download link download the file. So remove the link if there is no file.

=> There is no any file and if click on saveas then save the file. which is fixed by if there is any file then saveas will work else not.

Thanks.

To post a comment you must log in.
lp:~openerp-dev/openerp-web/trunk-kanban-document-bth updated
3712. By Bhumi Thakkar (Open ERP)

[MERGE] Merge lp:openerp-web.

3713. By Bhumi Thakkar (Open ERP)

[IMP] Add function to download files from kanban.

3714. By Bhumi Thakkar (Open ERP)

[MERGE] Merge lp:openerp-web.

Revision history for this message
Bhumi Thakkar (Open ERP) (bth-openerp) wrote :

Hello,

    Add function to download file from kanban view for generic.

Thanks.

Reply
lp:~openerp-dev/openerp-web/trunk-kanban-document-bth updated
3715. By Bhumi Thakkar (Open ERP)

[MERGE] Merge lp:openerp-web.

3716. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3717. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3718. By Bhumi Thakkar (Open ERP)

[MERGE] Merge lp:openerp-web.

3719. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3720. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3721. By Bhumi Thakkar (Open ERP)

[IMP]Add function of kanban url if there is no http:// in url value then return with http://.

3722. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3723. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3724. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3725. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3726. By Bhumi Thakkar (Open ERP)

[IMP]Removed button and add links into file widget.

3727. By Bhumi Thakkar (Open ERP)

[IMP]Improved code to set links besides input type='file'.

3728. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3729. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3730. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3731. By Bhumi Thakkar (Open ERP)

[MERGE]Merge lp:openerp-web.

3732. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3733. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3734. By Bhumi Thakkar (Open ERP)

[IMP]Formatting.

3735. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3736. By Bhumi Thakkar (Open ERP)

[IMP]Improved css class name and code.

3737. By Bhumi Thakkar (Open ERP)

[IMP]Create method to call server side method to return extension.

3738. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3739. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3740. By Sunil Sharma(OpenERP)

[IMP]:kanban filetype:

3741. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3742. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3743. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3744. By Darshan Kalola(OpenERP)

[MERGE]sync with trunk.

3745. By Sunil Sharma(OpenERP)

[MRG]:Merge lp:openerp-web

3746. By Chirag Dodiya(OpenERP)

[MRG]Merge with trunk

Unmerged revisions

3746. By Chirag Dodiya(OpenERP)

[MRG]Merge with trunk

3745. By Sunil Sharma(OpenERP)

[MRG]:Merge lp:openerp-web

3744. By Darshan Kalola(OpenERP)

[MERGE]sync with trunk.

3743. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3742. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3741. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3740. By Sunil Sharma(OpenERP)

[IMP]:kanban filetype:

3739. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3738. By Bhumi Thakkar (Open ERP)

[MERGE]Merge trunk.

3737. By Bhumi Thakkar (Open ERP)

[IMP]Create method to call server side method to return extension.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/view_form.js'
2--- addons/web/static/src/js/view_form.js 2014-02-20 14:13:02 +0000
3+++ addons/web/static/src/js/view_form.js 2014-03-04 12:37:08 +0000
4@@ -5198,7 +5198,7 @@
5 },
6 initialize_content: function() {
7 this.$el.find('input.oe_form_binary_file').change(this.on_file_change);
8- this.$el.find('button.oe_form_binary_file_save').click(this.on_save_as);
9+ this.$el.find('.oe_form_binary_file_save').click(this.on_save_as);
10 this.$el.find('.oe_form_binary_file_clear').click(this.on_clear);
11 },
12 on_file_change: function(e) {
13@@ -5246,7 +5246,7 @@
14 if (!value) {
15 this.do_warn(_t("Save As..."), _t("The field is empty, there's nothing to save !"));
16 ev.stopPropagation();
17- } else {
18+ } else if (this.view.datarecord[this.node.attrs.filename]) {
19 instance.web.blockUI();
20 var c = instance.webclient.crashmanager;
21 this.session.get_file({
22@@ -5309,7 +5309,9 @@
23 } else {
24 this.$el.find('a').toggle(!!this.get('value'));
25 if (this.get('value')) {
26- show_value = _t("Download");
27+ var show_value = '';
28+ if (this.view.datarecord[this.node.attrs.filename])
29+ show_value = _t("Download")
30 if (this.view)
31 show_value += " " + (this.view.datarecord[this.node.attrs.filename] || '');
32 this.$el.find('a').text(show_value);
33
34=== modified file 'addons/web/static/src/xml/base.xml'
35--- addons/web/static/src/xml/base.xml 2014-02-12 14:19:59 +0000
36+++ addons/web/static/src/xml/base.xml 2014-03-04 12:37:08 +0000
37@@ -1244,34 +1244,24 @@
38 t-att-tabindex="widget.node.attrs.tabindex"
39 t-att-autofocus="widget.node.attrs.autofocus"
40 class="field_binary"
41+ style="position:absolute;"
42 />
43 </td>
44- <td class="oe_form_binary" nowrap="true">
45+ <td class="oe_form_binary" nowrap="true" style="padding-left:35px;">
46 <table cellspacing="0" cellpadding="0" border="0">
47 <tr>
48 <td>
49 <t t-call="HiddenInputFile">
50 <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
51 <t t-set="fileupload_style" t-translation="off">width: 83px;</t>
52- <button class="oe_button oe_field_button" type="button">
53- <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
54- <span>Select</span>
55- </button>
56+ <a class="oe_select_file">Select</a>
57 </t>
58 </td>
59 <td>
60- <a class="oe_form_binary_file_save_data">
61- <button class="oe_button oe_form_binary_file_save" type="button" title="Save As">
62- <img t-att-src='_s + "/web/static/src/img/icons/gtk-save.png"'/>
63- <span>Save As</span>
64- </button>
65- </a>
66+ <a class="oe_link oe_form_binary_file_save">Save As</a>
67 </td>
68 <td>
69- <button class="oe_button oe_form_binary_file_clear" type="button" title="Clear">
70- <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
71- <span>Clear</span>
72- </button>
73+ <a class="oe_link oe_form_binary_file_clear">Clear</a>
74 </td>
75 </tr>
76 </table>
77
78=== modified file 'addons/web_kanban/static/src/js/kanban.js'
79--- addons/web_kanban/static/src/js/kanban.js 2014-01-31 00:52:02 +0000
80+++ addons/web_kanban/static/src/js/kanban.js 2014-03-04 12:37:08 +0000
81@@ -1119,6 +1119,9 @@
82 }
83 return url;
84 },
85+ kanban_download: function(id) {
86+ return this.session.url('/web/binary/saveas', {model: 'ir.attachment', field: 'datas', filename_field: 'datas_fname', id: id});
87+ },
88 kanban_text_ellipsis: function(s, size) {
89 size = size || 160;
90 if (!s) {
91@@ -1131,7 +1134,18 @@
92 },
93 kanban_compute_domain: function(domain) {
94 return instance.web.form.compute_domain(domain, this.values);
95- }
96+ },
97+ kanban_url: function(value) {
98+ var s = /(\w+):(.+)|^\.{0,2}\//.exec(value);
99+ var url = "";
100+ if (!s) {
101+ url = "http://"+value;
102+ }
103+ return url || value;
104+ },
105+ kanban_filetype: function(url) {
106+ return instance.base.filetype(url);
107+ },
108 });
109
110 /**
111@@ -1145,7 +1159,7 @@
112 */
113 instance.web_kanban.QuickCreate = instance.web.Widget.extend({
114 template: 'KanbanView.quick_create',
115-
116+
117 /**
118 * close_btn: If true, the widget will display a "Close" button able to trigger
119 * a "close" event.