Merge branch '113524121-legal_doc_min_size' into staging

This commit is contained in:
Vladimir Krylov 2016-03-07 12:23:30 +02:00
commit 7d877c89e9
6 changed files with 6 additions and 6 deletions

View file

@ -28,7 +28,7 @@ $(document).on 'page:change', ->
$('.js-contact-form').trigger('restoreDefault') $('.js-contact-form').trigger('restoreDefault')
$('[data-legal_document]').each (e)-> $('[data-legal-document]').each (e)->
fileInput = $(e.target) fileInput = $(e.target)
minSize = 1 * 1024 # 100kB minSize = 1 * 1024 # 100kB
maxSize = 8 * 1024 * 1024; # 8 MB maxSize = 8 * 1024 * 1024; # 8 MB

View file

@ -18,7 +18,7 @@
= label_tag 'domain[legal_document]', t(:legal_document), class: c = label_tag 'domain[legal_document]', t(:legal_document), class: c
%p.help-block= t(:legal_document_max_size) %p.help-block= t(:legal_document_max_size)
.col-md-7 .col-md-7
= file_field_tag 'domain[legal_document]', required: fr = file_field_tag 'domain[legal_document]', required: fr, data: {legal_document: true}
.col-md-4 .col-md-4
%p.domain-general-help= t(:domain_general_help).html_safe %p.domain-general-help= t(:domain_general_help).html_safe
%p.domain-admin-contact-help= t(:domain_admin_contact_help).html_safe %p.domain-admin-contact-help= t(:domain_admin_contact_help).html_safe

File diff suppressed because one or more lines are too long

View file

@ -23061,7 +23061,7 @@ jQuery(function() {
} }
}); });
$('.js-contact-form').trigger('restoreDefault'); $('.js-contact-form').trigger('restoreDefault');
return $('[data-legal_document]').each(function(e) { return $('[data-legal-document]').each(function(e) {
var fileInput, maxSize, minSize; var fileInput, maxSize, minSize;
fileInput = $(e.target); fileInput = $(e.target);
minSize = 1 * 1024; minSize = 1 * 1024;

View file

@ -23112,7 +23112,7 @@ jQuery(function() {
} }
}); });
$('.js-contact-form').trigger('restoreDefault'); $('.js-contact-form').trigger('restoreDefault');
return $('[data-legal_document]').each(function(e) { return $('[data-legal-document]').each(function(e) {
var fileInput, maxSize, minSize; var fileInput, maxSize, minSize;
fileInput = $(e.target); fileInput = $(e.target);
minSize = 1 * 1024; minSize = 1 * 1024;

View file

@ -29,7 +29,7 @@
} }
}); });
$('.js-contact-form').trigger('restoreDefault'); $('.js-contact-form').trigger('restoreDefault');
return $('[data-legal_document]').each(function(e) { return $('[data-legal-document]').each(function(e) {
var fileInput, maxSize, minSize; var fileInput, maxSize, minSize;
fileInput = $(e.target); fileInput = $(e.target);
minSize = 1 * 1024; minSize = 1 * 1024;