讨论区编辑添加附件

Signed-off-by: alan <547533434@qq.com>

Gemfile

@@ -24,7 +24,7 @@ gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
 gem 'rails_kindeditor',path:'lib/rails_kindeditor'
-#gem "rmagick", ">= 2.0.0"
+gem "rmagick", ">= 2.0.0"
 
 group :development do
   gem 'grape-swagger'

app/controllers/messages_controller.rb

@@ -172,18 +172,10 @@ class MessagesController < ApplicationController
   # Edit a message
   def edit
     @isReply = false
-    if params[:is_board]
-      if @project
-        (redirect_to project_boards_path(@project); return false)
-      elsif @course
-        (redirect_to course_boards_path(@course); return false)
-      end
+    if @project
+      (render_403; return false) unless @message.editable_by?(User.current)
     else
-      if @project
-        (render_403; return false) unless @message.editable_by?(User.current)
-      else
-        (render_403; return false) unless @message.course_editable_by?(User.current)
-      end
+      (render_403; return false) unless @message.course_editable_by?(User.current)
     end
 
     @message.safe_attributes = params[:message]

app/views/attachments/_form_course.html.erb

@@ -1,4 +1,4 @@
-<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<span id="attachments_fields<%= container.id %>" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
@@ -38,12 +38,12 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
 <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-<%= button_tag "#{l(:button_browse)}", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+<%= button_tag "#{l(:button_browse)}", :type=>"button", :onclick=>"file#{container.id}.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
 <%= file_field_tag 'attachments[dummy][file]',
-      :id => '_file',
+      :id => "file#{container.id}",
       :class => 'file_selector',
       :multiple => true,
-      :onchange => 'addInputFiles(this);',
+      :onchange => "addInputFiles_board(this, '#{container.id}');",
       :style => 'display:none',
       :data => {
         :max_file_size => Setting.attachment_max_size.to_i.kilobytes,

app/views/attachments/_form_project.html.erb

@@ -1,4 +1,4 @@
-<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<span id="attachments_fields<%= container.id %>" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
@@ -38,12 +38,12 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
   <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-  <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+  <%= button_tag "文件浏览", :type=>"button", :onclick=>"file#{container.id}.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
   <%= file_field_tag 'attachments[dummy][file]',
-                     :id => '_file',
+                     :id => "file#{container.id}",
                      :class => 'file_selector',
                      :multiple => true,
-                     :onchange => 'addInputFiles(this);',
+                     :onchange => "addInputFiles_board(this, '#{container.id}');",
                      :style => 'display:none',
                      :data => {
                              :max_file_size => Setting.attachment_max_size.to_i.kilobytes,

app/views/boards/_edit.html.erb

@@ -12,7 +12,7 @@
                            } do |f| %>
             <%= render :partial => 'form_project',
                      :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
-            <a href="#" onclick="$('#message-form<%= topic.id%>').submit();"class="blue_btn fl c_white" ><%= l(:button_submit)%></a>
+            <a href="#" onclick="$('#message-form<%= topic.id%>').submit();" class="blue_btn fl c_white" ><%= l(:button_submit)%></a>
               <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" class="blue_btn grey_btn fl c_white"><%= l(:button_cancel) %></a>
           <%#= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white"  %>
         </ul>

app/views/boards/_form_project.html.erb

@@ -51,7 +51,7 @@
 <li>
 <% unless replying %>
   <div  class="fl ml3" style="padding-left: 52px;">
-    <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
+    <%= render :partial => 'attachments/form_project', :locals => {:container => topic,:isReply => @isReply} %>
   </div>
  <% end %>
 </li>

public/javascripts/attachments.js

@@ -23,9 +23,10 @@ function reload(fileSpan) {
 
 }
 
-function addFile(inputEl, file, eagerUpload) {
+function addFile_board(inputEl, file, eagerUpload, id) {
 
-  if ($('#attachments_fields').children().length < 30) {
+  var attachments_frame = '#attachments_fields' + id;
+  if ($(attachments_frame).children().length < 30) {
     deleteallfiles = $(inputEl).data('deleteAllFiles');
     var attachmentId = addFile.nextAttachmentId++;
 
@@ -48,7 +49,7 @@ function addFile(inputEl, file, eagerUpload) {
 
         }).toggle(!eagerUpload),
         $('<div>', {  'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
-    ).appendTo('#attachments_fields');
+    ).appendTo(attachments_frame);
 
       if(eagerUpload) {
          ajaxUpload(file, attachmentId, fileSpan, inputEl);
@@ -58,7 +59,42 @@ function addFile(inputEl, file, eagerUpload) {
   }
   return null;
 }
+function addFile(inputEl, file, eagerUpload) {
+
+    var attachments_frame = '#attachments_fields';
+    if ($(attachments_frame).children().length < 30) {
+        deleteallfiles = $(inputEl).data('deleteAllFiles');
+        var attachmentId = addFile.nextAttachmentId++;
+
+        var fileSpan = $('<span>', { 'id': 'attachments_' + attachmentId, 'class':'attachment' });
+
+        fileSpan.append(
+            $('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
+            $('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload),
+            $('<span >'+$(inputEl).data('fieldIsPublic')+':</span>').attr({  'class': 'ispublic-label' }) ,
+            $('<input>', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload),
+            $('<a>&nbsp</a>').attr({ 'href': "#", 'class': 'remove-upload' }).click(function(){
+                if(confirm($(inputEl).data('areYouSure'))){
+                    removeFile();
+                    if(!eagerUpload){
+                        (function(e){
+                            reload(e);
+                        })(fileSpan);
+                    }
+                }
 
+            }).toggle(!eagerUpload),
+            $('<div>', {  'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
+        ).appendTo('#attachments_fields');
+
+        if(eagerUpload) {
+            ajaxUpload(file, attachmentId, fileSpan, inputEl);
+
+        }
+        return attachmentId;
+    }
+    return null;
+}
 addFile.nextAttachmentId = 1;
 
 function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
@@ -202,7 +238,26 @@ function addInputFiles(inputEl) {
 
     //clearedFileInput.insertAfter('#attachments_fields');
 }
+function addInputFiles_board(inputEl, id) {
+    // var clearedFileInput = $(inputEl).clone().val('');
+
+    if (inputEl.files) {
+        // upload files using ajax
+        uploadAndAttachFiles_board(inputEl.files, inputEl, id);
+        //   $(inputEl).remove();
+    } else {
+        // browser not supporting the file API, upload on form submission
+        var attachmentId;
+        var aFilename = inputEl.value.split(/\/|\\/);
+        attachmentId = addFile_board(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false, id);
+        if (attachmentId) {
+            $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]'}).hide();
+            $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
+        }
+    }
 
+    //clearedFileInput.insertAfter('#attachments_fields');
+}
 function uploadAndAttachFiles(files, inputEl) {
 
   var maxFileSize = $(inputEl).data('max-file-size');
@@ -218,7 +273,21 @@ function uploadAndAttachFiles(files, inputEl) {
     $.each(files, function() {addFile(inputEl, this, true);});
   }
 }
+function uploadAndAttachFiles_board(files, inputEl, id) {
 
+    var maxFileSize = $(inputEl).data('max-file-size');
+    var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
+
+    var sizeExceeded = false;
+    $.each(files, function() {
+        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {sizeExceeded=true;}
+    });
+    if (sizeExceeded) {
+        window.alert(maxFileSizeExceeded);
+    } else {
+        $.each(files, function() {addFile_board(inputEl, this, true, id);});
+    }
+}
 function handleFileDropEvent(e) {
 
   $(this).removeClass('fileover');

public/stylesheets/courses.css

@@ -83,8 +83,8 @@ a:hover.talk_edit{ color:#ff5722;}
 .talkpage_text{  border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;}
 /****新建讨论***/
 .talk_new{  color:#4c4c4c;}
-.talk_input{ border:1px solid #64bdd9; height:16px; width:585px; background:#fff; margin-bottom:10px; padding:5px;}
-.talk_text{ border:1px solid #64bdd9; height:100px;width:585px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
+.talk_input{ border:1px solid #64bdd9; height:16px; width:550px; background:#fff; margin-bottom:10px; padding:5px;}
+.talk_text{ border:1px solid #64bdd9; height:100px;width:550px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
 .talk_new ul li{ }
 .sb{width:70px; height:26px; color:#606060; cursor:pointer;}
 a.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;}
@@ -364,6 +364,23 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .reply_btn:hover{ background:#999; color:#fff; }
 
 #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+
+.attachments_fields input.description {margin-left:4px; width:100px; }
+.attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
+.attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+a.remove-upload:hover {text-decoration:none !important;}
+.attachments_fields input.is_public_checkbox {width:20px;}
+
+
+.attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
+.attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;}
+span.add_attachment {font-size: 80%;line-height: 2.5em;}
+.attachments_fields span {display: block;white-space: nowrap;}
+.file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);}
+.attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
+.attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+
 .ui-widget {
     font-family: Verdana, sans-serif;
     font-size: 1.1em;

public/stylesheets/project.css

@@ -123,8 +123,8 @@ a:hover.talk_edit{ color:#ff5722;}
 .recall_con{ float:left;color:#777777; width:520px; margin-left:10px; }
 /****新建讨论***/
 .talk_new{  color:#4c4c4c;}
-.talk_input{ border:1px solid #64bdd9; height:16px; width:585px; background:#fff; margin-bottom:10px; padding:5px;}
-.talk_text{ border:1px solid #64bdd9; height:100px;width:585px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
+.talk_input{ border:1px solid #64bdd9; height:16px; width:550px; background:#fff; margin-bottom:10px; padding:5px;}
+.talk_text{ border:1px solid #64bdd9; height:100px;width:550px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
 .talk_new ul li{ }
 .sb{width:70px; height:26px; color:#606060; cursor:pointer;}
 /*a.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;}*/
@@ -254,7 +254,21 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .reply_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #ccc; color:#999;  border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}
 .reply_btn:hover{ background:#999; color:#fff; }
 
+.attachments_fields input.description {margin-left:4px; width:100px; }
+.attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
+.attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+a.remove-upload:hover {text-decoration:none !important;}
+.attachments_fields input.is_public_checkbox {width:20px;}
+
 
+.attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
+.attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;}
+span.add_attachment {font-size: 80%;line-height: 2.5em;}
+.attachments_fields span {display: block;white-space: nowrap;}
+.file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);}
+.attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
+.attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
 
 .ui-widget {
     font-family: Verdana, sans-serif;