Merge branch 'master' into devel-1.6.1

This commit is contained in:
Karel Picman 2017-11-28 14:53:05 +01:00
commit c9914e938e
2 changed files with 4 additions and 4 deletions

View File

@ -77,7 +77,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="box"> <div class="box" id="file_upload_box">
<p> <p>
<%= label_tag('file_upload', l(:label_new_content)) %> <%= label_tag('file_upload', l(:label_new_content)) %>
<%= render :partial => 'dmsf_upload/form', <%= render :partial => 'dmsf_upload/form',

View File

@ -192,11 +192,11 @@
} }
}); });
$('#file_upload').change(function() { $('#file_upload_box').change(function() {
if($("input[name='version']:checked").val() == '0') { if($("input[name='version']:checked").val() == '0') {
$('#fileMinorVersionRadio').prop('checked', true); $('#version_1').prop('checked', true);
} }
$('#fileSameVersionRadio').prop('disabled', true); $('#version_0').prop('disabled', true);
}); });
$('#newRevisionFormContentToggle').click(function() { $('#newRevisionFormContentToggle').click(function() {