Merge lp:~fabien-morin/unifield-web/fm-us-1965 into lp:unifield-web

[jftempo]

[lp:~fabien-morin/unifield-web/fm-us-1965]

4835. By Fabien MORIN on 2017-02-06

US-1965 [FIX] check no save are done if a attachment is bigger than the max
allowed size. Before this fix, it was possible to select a bigger file than the
max allowed, get the warning message that this file is too big, and then click
on save.
This actions were resulting on sending the datas to the server that was refusing
it because they were too big. Now if the size of the file is too big, the
document is not saved, data not sent to the server.

4836. By Fabien MORIN on 2017-02-06

US-1965 [MERGE] with latest trunk

4837. By Fabien MORIN on 2017-02-06

US-1965 [FIX] check a attachment is set before to check the size of it

[lp:~fabien-morin/unifield-web/fm-us-1965]

4838. By Fabien MORIN on 2017-02-09

US-1965 [IMP] remove unused variables added by mistake

=== modified file 'addons/openerp/controllers/attachment.py'
--- addons/openerp/controllers/attachment.py	2017-01-02 14:59:00 +0000
+++ addons/openerp/controllers/attachment.py	2017-02-09 07:41:48 +0000
@@ -39,6 +39,7 @@
 
         if id:
             ctx = dict(rpc.session.context)
+            ctx['from_web_interface'] = True
 
             action = dict(
                 rpc.RPCProxy('ir.attachment').action_get(ctx),
@@ -75,13 +76,17 @@
         ctx = dict(rpc.session.context,
                    default_res_model=params.model, default_res_id=params.id,
                    active_id=False, active_ids=[])
+        ctx['from_web_interface'] = True
 
-        attachment_id = rpc.RPCProxy('ir.attachment').create({
-            'name': datas.filename,
-            'datas_fname': datas.filename,
-            'datas': base64.encodestring(datas.file.read()),
-        }, ctx)
-        return {'id': attachment_id, 'name': datas.filename}
+        try:
+            attachment_id = rpc.RPCProxy('ir.attachment').create({
+                'name': datas.filename,
+                'datas_fname': datas.filename,
+                'datas': base64.encodestring(datas.file.read()),
+            }, ctx)
+            return {'id': attachment_id, 'name': datas.filename}
+        except Exception, e:
+            return {'error': ustr(e)}
 
     @expose('json', methods=('POST',))
     def remove(self, id=False, **kw):

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2017-01-02 14:59:00 +0000
+++ addons/openerp/controllers/form.py	2017-02-09 07:41:48 +0000
@@ -491,6 +491,7 @@
                 params.count += 1
             else:
                 ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
+                ctx['from_web_interface'] = True
                 if params.button and params.button.name:
                     ctx.update({'button': params.button.name})
 
@@ -784,6 +785,7 @@
 
         proxy = rpc.RPCProxy(params.model)
         ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
+        ctx['from_web_interface'] = True
 
         if params.fname:
             proxy.write([params.id], {params.field: False, params.fname: False}, ctx)
@@ -855,6 +857,7 @@
         params, data = TinyDict.split(kw)
         if params.get('_terp_save_current_id'):
             ctx = dict((params.context or {}), **rpc.session.context)
+            ctx['from_web_interface'] = True
             if params.id:
                 rpc.RPCProxy(params.model).write([params.id], data, ctx)
             else:

=== modified file 'addons/openerp/po/javascript/fr.po'
--- addons/openerp/po/javascript/fr.po	2017-01-02 14:59:00 +0000
+++ addons/openerp/po/javascript/fr.po	2017-02-09 07:41:48 +0000
@@ -110,3 +110,7 @@
 #: static/javascript/openerp/openerp.ui.tips.js:52
 msgid "Field"
 msgstr "Champ"
+
+#: static/javascript/form.js
+msgid "You cannot upload files bigger than %(max_size)sMB, current size is %(size)sMB"
+msgstr "Vous ne pouvez pas envoyer des fichiers plus gros que %(max_size)sMB, la taille actuelle est de  %(size)sMB"

=== modified file 'addons/openerp/static/javascript/binary.js'
--- addons/openerp/static/javascript/binary.js	2017-01-02 14:59:00 +0000
+++ addons/openerp/static/javascript/binary.js	2017-02-09 07:41:48 +0000
@@ -19,6 +19,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+
 function save_binary_data(src, filename) {
 
     var name = openobject.dom.get(src) ? openobject.dom.get(src).name : src;
@@ -71,24 +72,26 @@
 }
 
 function set_binary_filename(src, filename) {
-    
     var $src = jQuery(src);
-    
+
+    // Check attachment size is not bigger than max attachment size
+    // refuse it if bigger.
+    if (check_attachment_size(src) !== true) {
+        return false
+    }
+
     var name = $src.attr('name');
-    
     var prefix = name.split('/'); prefix.pop();
     var prefix = prefix.join('/'); prefix = prefix ? prefix + '/' : '';
-    
     var target = getElement(prefix + filename);
     var fname = $src.val() || '';
-    
+
     if (/Windows NT/.test(window.navigator.userAgent)) {
         fname = fname.split('\\'); fname = fname.pop(); 
     }
     else {
         fname = fname.split('/'); fname = fname.pop();
     }
-    
     if (target) {
         target.value = fname;
     }

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2017-01-02 14:59:00 +0000
+++ addons/openerp/static/javascript/form.js	2017-02-09 07:41:48 +0000
@@ -230,6 +230,34 @@
     return result;
 }
 
+function validate_binary_size(form){
+
+    if (typeof form == 'string') {
+        form = jQuery('#' + form).get(0);
+    }
+
+    if (!form) {
+        return true;
+    }
+
+    var elements = MochiKit.Base.filter(function(el){
+        return !el.disabled && el.id && el.name && el.id.indexOf('_terp_listfields/') == -1 && hasElementClass(el, 'binary');
+    }, form.elements);
+
+    var result = true;
+
+    for (var i = 0; i < elements.length; i++) {
+        var elem = elements[i];
+        var kind = jQuery(elem).attr('kind');
+
+        if (kind == 'binary') {
+            return check_attachment_size(elem);
+        }
+    }
+    return result;
+}
+
+
 function error_display(msg) {
     var error = jQuery("<table>",{'width': '100%', 'height': '100%'}
                 ).append(
@@ -298,6 +326,11 @@
         return;
     }
 
+    // check there is no binary data exceding the maximum size
+    if (/\/save(\?|\/)?/.test(action) && !validate_binary_size($form[0])) {
+        return;
+    }
+
     // Cant use $form.attr due to http://dev.jquery.com/ticket/3113 as there is a form with a field called
     // action when creating an activity
     $form[0].setAttribute('action', action);
@@ -1295,6 +1328,26 @@
     return false;
 }
 
+function check_attachment_size(obj) {
+    var $datas = jQuery(obj);
+    var $max_size = $datas.attr('max-size');
+    if (typeof $max_size !== "undefined" && obj.files && obj.files[0]) {
+        var $file_size = obj.files[0].size;
+        if ($file_size > $max_size) {
+            var $mb_size = $file_size/1024/1024;
+            $mb_size = parseFloat($mb_size).toFixed( 2 );
+            var $mb_max_size = $max_size/1024/1024;
+            $mb_max_size = parseFloat($mb_max_size).toFixed( 2 );
+            var msg = _('You cannot upload files bigger than %(max_size)sMB, current size is %(size)sMB');
+            msg = msg.replace('%(size)s', $mb_size);
+            msg = msg.replace('%(max_size)s', $mb_max_size);
+            return error_display(msg);
+        };
+    };
+    return true;
+}
+
+
 /**
  * @event form submission
  *
@@ -1303,6 +1356,13 @@
  * Creates a new line in #attachments if the creation succeeds.
  */
 function createAttachment(){
+
+    // Check attachment size is not bigger than max attachment size
+    // refuse it if bigger.
+    if (check_attachment_size(this.children.datas) !== true) {
+        return false
+    }
+
     var $form = jQuery(this);
     if(!jQuery(idSelector('_terp_id')).val() || jQuery(idSelector('_terp_id')).val() == 'False') {
         return error_display(_('No record selected ! You can only attach to existing record.'));
@@ -1315,7 +1375,12 @@
     $form.ajaxSubmit({
         dataType: 'json',
         data: {'requested_with': 'XMLHttpRequest'},
-        success: function(data){
+        type: 'POST',
+        success: function(data) {
+            if ('error' in data) {
+                // display error message from server
+                return error_display(data['error']);
+            }
             var $attachment_line = jQuery('<li>', {
                 'id': 'attachment_item_' + data['id'],
                 'data-id': data['id']

=== modified file 'addons/openerp/utils/tools.py'
--- addons/openerp/utils/tools.py	2016-08-31 07:37:14 +0000
+++ addons/openerp/utils/tools.py	2017-02-09 07:41:48 +0000
@@ -230,6 +230,9 @@
         concurrency_info = [concurrency_info]
     return dict(ctx, __last_update=dict(concurrency_info))
 
+def get_max_attachment_size():
+    attachment = rpc.RPCProxy('ir.attachment')
+    return attachment.get_attachment_max_size()
 
 class TempFileName(str):
     '''A string representing a temporary file name that will be deleted when object is deleted'''

=== modified file 'addons/openerp/widgets/form/_binary.py'
--- addons/openerp/widgets/form/_binary.py	2017-01-02 14:59:00 +0000
+++ addons/openerp/widgets/form/_binary.py	2017-02-09 07:41:48 +0000
@@ -7,7 +7,7 @@
 #  Developed by OpenERP (http://openerp.com) and Axelor (http://axelor.com).
 #
 #  The OpenERP web client is distributed under the "OpenERP Public License".
-#  It's based on Mozilla Public License Version (MPL) 1.1 with following 
+#  It's based on Mozilla Public License Version (MPL) 1.1 with following
 #  restrictions:
 #
 #  -   All names, links and logos of OpenERP must be kept as in original
@@ -40,7 +40,8 @@
 
 class Binary(TinyInputWidget):
     template = "/openerp/widgets/form/templates/binary.mako"
-    params = ["name", "text", "readonly", "filename", "bin_data", 'value_bin_size', 'ctx', 'accept']
+    params = ["name", "text", "readonly", "filename", "bin_data",
+            'value_bin_size', 'ctx', 'accept', 'max_attachment_size']
 
     text = None
     file_upload = True
@@ -53,6 +54,7 @@
         # if bin_size was in context when reading the binary field, then the field's value is actually the binary
         # field's content size
         self.value_bin_size = getattr(self, 'context', {}).get('bin_size', False)
+        self.max_attachment_size = utils.get_max_attachment_size()
         self.ctx = getattr(self, 'context', {}).get('from', False)
         self.accept = attrs.get('accept')
 

=== modified file 'addons/openerp/widgets/form/templates/binary.mako'
--- addons/openerp/widgets/form/templates/binary.mako	2017-01-02 14:59:00 +0000
+++ addons/openerp/widgets/form/templates/binary.mako	2017-02-09 07:41:48 +0000
@@ -9,13 +9,23 @@
             value="${bin_data}"/>
     % endif
     <div id="${name}_binary_add" style="display: none;">
-        % if editable and not readonly:
-        <input ${py.attrs(attrs)}
-            accept="${accept}"
-            type="file"
-            class="${css_class}"
-            kind="${kind}"
-            disabled="disabled"
+        % if editable and not readonly and model != 'ir.attachment':
+        <input ${py.attrs(attrs)}
+            accept="${accept}"
+            type="file"
+            class="${css_class}"
+            kind="${kind}"
+            disabled="disabled"
+            id="${name}"
+            name="${name}"/>
+        % elif editable and not readonly and model == 'ir.attachment':
+        <input ${py.attrs(attrs)}
+            accept="${accept}"
+            type="file"
+            class="${css_class}"
+            kind="${kind}"
+            disabled="disabled"
+            max-size="${max_attachment_size}"
             id="${name}"
             name="${name}"/>
         % endif

=== modified file 'addons/openerp/widgets/sidebar.py'
--- addons/openerp/widgets/sidebar.py	2014-04-17 14:01:17 +0000
+++ addons/openerp/widgets/sidebar.py	2017-02-09 07:41:48 +0000
@@ -20,12 +20,14 @@
 ###############################################################################
 from openerp.utils import rpc
 from openerp.widgets import TinyWidget
+from openerp import utils
 
 
 class Sidebar(TinyWidget):
 
     template = "/openerp/widgets/templates/sidebar.mako"
-    params = ['reports', 'actions', 'relates', 'attachments', 'sub_menu', 'view_type', 'model', 'id', 'ctx']
+    params = ['reports', 'actions', 'relates', 'attachments', 'sub_menu',
+            'view_type', 'model', 'id', 'ctx', 'max_attachment_size']
 
     def add_remote_action_values(self, action_type, current_actions):
         actions = rpc.RPCProxy('ir.values').get(
@@ -47,6 +49,7 @@
         self.reports = toolbar.get('print', [])
         self.actions = toolbar.get('action', [])
         self.relates = toolbar.get('relate', [])
+        self.max_attachment_size = utils.get_max_attachment_size()
         self.attachments = []
         self.sub_menu = None
 

=== modified file 'addons/openerp/widgets/templates/sidebar.mako'
--- addons/openerp/widgets/templates/sidebar.mako	2013-01-09 10:29:26 +0000
+++ addons/openerp/widgets/templates/sidebar.mako	2017-02-09 07:41:48 +0000
@@ -73,7 +73,8 @@
               enctype="multipart/form-data">
             <label for="sidebar_attachments_datas">${_("File")}:</label>
             <input type="file" id="sidebar_attachments_datas" class="binary"
-                   name="datas" kind="binary" size="5"/>
+                   name="datas" kind="binary" size="5"
+                   max-size="${max_attachment_size}"/>
         </form>
     </div>
     % endif