Changeset 5720

Timestamp:

03/14/12 15:15:03 (11 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao no nome de arquivos anexados sem extensao

Location:

trunk/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (1 diff)
• helpers.js (modified) (2 diffs)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -584 +584 @@
                                 attachments: $.map(objEvent.attachments || [], function( attachment, i ){
                                         var attach = DataLayer.get('schedulableToAttachment', attachment, false);
-                                        attach.name = attach.name.length < 10 ?  attach.name : ( attach.name.substr(0, 6) + attach.name.substr( attach.name.length-4, attach.name.length));
+                                        var ext = attach.name.split('.');
+                                        attach.name = attach.name.length < 10 ?  attach.name : ( ext.length == 1 ? attach.name.substr(0, 10) : (attach.name.substr(0, 6) + '.' +  ext[ext.length -1]));
                                         attach.size = formatBytes(attach.size);
                                         return attach;

trunk/prototype/modules/calendar/js/helpers.js

@@ -1090 +1090 @@
                                 text: false
                 });
-                
+        var maxSizeFile = 2000000;
         $('#fileupload').fileupload({
                 sequentialUploads: true,
                 add: function (e, data) {
-                        if(data.files[0].size < 2000000)
+                        if(data.files[0].size < maxSizeFile)
                                 data.submit();
                 },
@@ -1101 +1101 @@
                                 var attach = {};
                                 attach.fileName = file.name;
+                                var ext = file.name.split('.');
                                 if(file.name.length > 10)
-                                        attach.fileName = file.name.substr(0, 6) + file.name.substr(file.name.length-4, file.name.length);
+                                        attach.fileName = ext.length == 1 ? file.name.substr(0, 10) :  file.name.substr(0, 6) + '.' + ext[ext.length -1];
                                 attach.fileSize = formatBytes(file.size);
-                                if(file.size > 2000000)
+                                if(file.size > maxSizeFile)
                                         attach.error = 'Tamanho de arquivo nao permitido!!'
                                 
                                 $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {file : attach}));
                                 
-                                if(file.size < 2000000){
+                                if(file.size < maxSizeFile){
                                         $('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
                                         $('.attachments-list').find('[type=file]').addClass('hidden');