From 29114e19f3c5a2afbcc8e12d0ce875375f92dcdd Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 12 May 2015 15:15:04 +0800
Subject: [PATCH] Signed-off-by: alan <547533434@qq.com>

---
 Gemfile                                      | 2 +-
 app/views/boards/_course_new.html.erb        | 2 +-
 app/views/boards/_form_course.html.erb       | 2 +-
 app/views/boards/_form_project.html.erb      | 2 +-
 app/views/boards/_project_new_topic.html.erb | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0aa77ae99..810190a6a 100644
--- a/Gemfile
+++ b/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'
diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index e80ce8135..fba80127b 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -2,7 +2,7 @@
 
     <%= render :partial => 'form_course', :locals => {:f => f,  :topic => @message} %>
     <li>
-      <%= link_to l(:button_cancel), course_boards_path(@course), :class => 'grey_btn fr ml10' %>
+      <a href="javascript:void(0)"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
       <a href="#" onclick="$('#message-form').submit();" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>
diff --git a/app/views/boards/_form_course.html.erb b/app/views/boards/_form_course.html.erb
index 5cd2d8a2f..09ee1c3b4 100644
--- a/app/views/boards/_form_course.html.erb
+++ b/app/views/boards/_form_course.html.erb
@@ -51,7 +51,7 @@
 <li>
   <% unless replying %>
       <div  class="fl ml3" style="padding-left: 52px;">
-        <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
+        <%= render :partial => 'attachments/form_course', :locals => {:container => topic,:isReply => @isReply} %>
       </div>
   <% end %>
 </li>
diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index 4e0ffe8e7..b42cabbeb 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/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 => topic,:isReply => true} %>
+    <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
   </div>
  <% end %>
 </li>
diff --git a/app/views/boards/_project_new_topic.html.erb b/app/views/boards/_project_new_topic.html.erb
index 2207c4b10..3f7c569e1 100644
--- a/app/views/boards/_project_new_topic.html.erb
+++ b/app/views/boards/_project_new_topic.html.erb
@@ -2,7 +2,8 @@
 
     <%= render :partial => 'form_project', :locals => {:f => f,  :topic => @message} %>
     <li>
-      <%= link_to l(:button_cancel), project_boards_path(@project), :class => 'grey_btn fr ml10' %>
+      <a href="javascript:void(0)"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
+
       <a href="#" onclick="$('#message-form').submit();" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>