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

[Bhumi Thakkar (Open ERP)]

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.

[lp:~openerp-dev/openerp-web/trunk-kanban-document-bth]

3712. By Bhumi Thakkar (Open ERP) on 2013-04-05

[MERGE] Merge lp:openerp-web.

3713. By Bhumi Thakkar (Open ERP) on 2013-04-08

[IMP] Add function to download files from kanban.

3714. By Bhumi Thakkar (Open ERP) on 2013-04-09

[MERGE] Merge lp:openerp-web.

[Bhumi Thakkar (Open ERP) (bth-openerp)]

Hello,

    Add function to download file from kanban view for generic.

Thanks.

[lp:~openerp-dev/openerp-web/trunk-kanban-document-bth]

3715. By Bhumi Thakkar (Open ERP) on 2013-04-17

[MERGE] Merge lp:openerp-web.

3716. By Bhumi Thakkar (Open ERP) on 2013-05-03

[MERGE]Merge lp:openerp-web.

3717. By Bhumi Thakkar (Open ERP) on 2013-05-23

[MERGE]Merge lp:openerp-web.

3718. By Bhumi Thakkar (Open ERP) on 2013-05-31

[MERGE] Merge lp:openerp-web.

3719. By Bhumi Thakkar (Open ERP) on 2013-06-05

[MERGE]Merge lp:openerp-web.

3720. By Bhumi Thakkar (Open ERP) on 2013-06-13

[MERGE]Merge lp:openerp-web.

3721. By Bhumi Thakkar (Open ERP) on 2013-06-14

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

3722. By Bhumi Thakkar (Open ERP) on 2013-06-14

[MERGE]Merge lp:openerp-web.

3723. By Bhumi Thakkar (Open ERP) on 2013-06-24

[MERGE]Merge lp:openerp-web.

3724. By Bhumi Thakkar (Open ERP) on 2013-07-09

[MERGE]Merge lp:openerp-web.

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

[MERGE]Merge lp:openerp-web.

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

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

3727. By Bhumi Thakkar (Open ERP) on 2013-07-17

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

3728. By Bhumi Thakkar (Open ERP) on 2013-07-17

[MERGE]Merge lp:openerp-web.

3729. By Bhumi Thakkar (Open ERP) on 2013-08-08

[MERGE]Merge lp:openerp-web.

3730. By Bhumi Thakkar (Open ERP) on 2013-08-13

[MERGE]Merge lp:openerp-web.

3731. By Bhumi Thakkar (Open ERP) on 2013-08-26

[MERGE]Merge lp:openerp-web.

3732. By Bhumi Thakkar (Open ERP) on 2013-08-30

[MERGE]Merge trunk.

3733. By Bhumi Thakkar (Open ERP) on 2013-09-06

[MERGE]Merge trunk.

3734. By Bhumi Thakkar (Open ERP) on 2013-09-10

[IMP]Formatting.

3735. By Bhumi Thakkar (Open ERP) on 2013-09-11

[MERGE]Merge trunk.

3736. By Bhumi Thakkar (Open ERP) on 2013-09-11

[IMP]Improved css class name and code.

3737. By Bhumi Thakkar (Open ERP) on 2013-09-11

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

3738. By Bhumi Thakkar (Open ERP) on 2013-09-13

[MERGE]Merge trunk.

3739. By Bhumi Thakkar (Open ERP) on 2013-09-19

[MERGE]Merge trunk.

3740. By Sunil Sharma(OpenERP) on 2013-09-25

[IMP]:kanban filetype:

3741. By Bhumi Thakkar (Open ERP) on 2013-10-29

[MERGE]Merge trunk.

3742. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

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

[MERGE]Merge trunk.

3744. By Darshan Kalola(OpenERP) on 2014-02-11

[MERGE]sync with trunk.

3745. By Sunil Sharma(OpenERP) on 2014-02-13

[MRG]:Merge lp:openerp-web

3746. By Chirag Dodiya(OpenERP) on 2014-03-04

[MRG]Merge with trunk

Unmerged revisions

3746. By Chirag Dodiya(OpenERP) on 2014-03-04

[MRG]Merge with trunk

3745. By Sunil Sharma(OpenERP) on 2014-02-13

[MRG]:Merge lp:openerp-web

3744. By Darshan Kalola(OpenERP) on 2014-02-11

[MERGE]sync with trunk.

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

[MERGE]Merge trunk.

3742. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

3741. By Bhumi Thakkar (Open ERP) on 2013-10-29

[MERGE]Merge trunk.

3740. By Sunil Sharma(OpenERP) on 2013-09-25

[IMP]:kanban filetype:

3739. By Bhumi Thakkar (Open ERP) on 2013-09-19

[MERGE]Merge trunk.

3738. By Bhumi Thakkar (Open ERP) on 2013-09-13

[MERGE]Merge trunk.

3737. By Bhumi Thakkar (Open ERP) on 2013-09-11

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

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-02-20 14:13:02 +0000
+++ addons/web/static/src/js/view_form.js	2014-03-04 12:37:08 +0000
@@ -5198,7 +5198,7 @@
     },
     initialize_content: function() {
         this.$el.find('input.oe_form_binary_file').change(this.on_file_change);
-        this.$el.find('button.oe_form_binary_file_save').click(this.on_save_as);
+        this.$el.find('.oe_form_binary_file_save').click(this.on_save_as);
         this.$el.find('.oe_form_binary_file_clear').click(this.on_clear);
     },
     on_file_change: function(e) {
@@ -5246,7 +5246,7 @@
         if (!value) {
             this.do_warn(_t("Save As..."), _t("The field is empty, there's nothing to save !"));
             ev.stopPropagation();
-        } else {
+        } else if (this.view.datarecord[this.node.attrs.filename]) {
             instance.web.blockUI();
             var c = instance.webclient.crashmanager;
             this.session.get_file({
@@ -5309,7 +5309,9 @@
         } else {
             this.$el.find('a').toggle(!!this.get('value'));
             if (this.get('value')) {
-                show_value = _t("Download");
+                var show_value = '';
+                if (this.view.datarecord[this.node.attrs.filename])
+                    show_value = _t("Download")
                 if (this.view)
                     show_value += " " + (this.view.datarecord[this.node.attrs.filename] || '');
                 this.$el.find('a').text(show_value);
 
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2014-02-12 14:19:59 +0000
+++ addons/web/static/src/xml/base.xml	2014-03-04 12:37:08 +0000
@@ -1244,34 +1244,24 @@
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
                     class="field_binary"
+                    style="position:absolute;"
                 />
             </td>
-            <td class="oe_form_binary" nowrap="true">
+            <td class="oe_form_binary" nowrap="true" style="padding-left:35px;">
                 <table cellspacing="0" cellpadding="0" border="0">
                 <tr>
                     <td>
                         <t t-call="HiddenInputFile">
                             <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
                             <t t-set="fileupload_style" t-translation="off">width: 83px;</t>
-                            <button class="oe_button oe_field_button" type="button">
-                                <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
-                                <span>Select</span>
-                            </button>
+                            <a class="oe_select_file">Select</a>
                         </t>
                     </td>
                     <td>
-                        <a class="oe_form_binary_file_save_data">
-                            <button class="oe_button oe_form_binary_file_save" type="button" title="Save As">
-                                <img t-att-src='_s + "/web/static/src/img/icons/gtk-save.png"'/>
-                                <span>Save As</span>
-                            </button>
-                        </a>
+                        <a class="oe_link oe_form_binary_file_save">Save As</a>
                     </td>
                     <td>
-                        <button class="oe_button oe_form_binary_file_clear" type="button" title="Clear">
-                            <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
-                            <span>Clear</span>
-                        </button>
+                        <a class="oe_link oe_form_binary_file_clear">Clear</a>
                     </td>
                 </tr>
                 </table>
 
=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2014-01-31 00:52:02 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2014-03-04 12:37:08 +0000
@@ -1119,6 +1119,9 @@
         }
         return url;
     },
+    kanban_download: function(id) {
+        return this.session.url('/web/binary/saveas', {model: 'ir.attachment', field: 'datas', filename_field: 'datas_fname', id: id});
+    },
     kanban_text_ellipsis: function(s, size) {
         size = size || 160;
         if (!s) {
@@ -1131,7 +1134,18 @@
     },
     kanban_compute_domain: function(domain) {
         return instance.web.form.compute_domain(domain, this.values);
-    }
+    },
+    kanban_url: function(value) {
+        var s = /(\w+):(.+)|^\.{0,2}\//.exec(value);
+        var url = "";
+        if (!s) {
+            url = "http://"+value;
+        }
+        return url || value;
+    },
+    kanban_filetype: function(url) {
+        return instance.base.filetype(url);
+    },
 });
 
 /**
@@ -1145,7 +1159,7 @@
  */
 instance.web_kanban.QuickCreate = instance.web.Widget.extend({
     template: 'KanbanView.quick_create',
-    
+
     /**
      * close_btn: If true, the widget will display a "Close" button able to trigger
      * a "close" event.