From 63b644dbb91cccdf0cd7d799ed356bb23bdaad2e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 20 Feb 2016 11:06:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E2=80=9D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=B8=96=E5=AD=90=E9=99=84=E4=BB=B6=E8=B6=85=E8=BF=8720?= =?UTF-8?q?=E4=B8=AA=E5=90=8E=EF=BC=8C=E7=BC=96=E8=BE=91=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A0=E9=99=84=E4=BB=B6=E2=80=9C=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/_attachment.html.erb | 2 +- public/javascripts/attachments.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/org_document_comments/_attachment.html.erb b/app/views/org_document_comments/_attachment.html.erb index 86298a330..9acdc2dc8 100644 --- a/app/views/org_document_comments/_attachment.html.erb +++ b/app/views/org_document_comments/_attachment.html.erb @@ -7,7 +7,7 @@ <% if defined?(container) && container && container.saved_attachments %> <% container.attachments.each_with_index do |attachment, i| %> - <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><%= l(:field_is_public) %>: + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><%= l(:field_is_public) %>: <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %> <%= if attachment.id.nil? #待补充代码 diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index b60b6ad28..5ddadb373 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -91,7 +91,7 @@ function addFile_board(inputEl, file, eagerUpload, id,btnId) { function addFile(inputEl, file, eagerUpload,btnId) { var attachments_frame = '#attachments_fields'; - if ($(attachments_frame).children().length < 30) { + if (true) { deleteallfiles = $(inputEl).data('deleteAllFiles'); var attachmentId = addFile.nextAttachmentId++;