From dfdc58719a6519dd227bd2bc1af5b0829e1e440d Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Mon, 28 Jul 2014 10:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=BB=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journals_for_message.rb  | 10 ++++++++++
 app/views/courses/feedback.html.erb |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 4debe668f..c79004794 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -68,6 +68,7 @@ class JournalsForMessage < ActiveRecord::Base
       return true
     end
   end
+
   
   def self.remove_by_user? user
     if(  self.user == user || 
@@ -87,6 +88,15 @@ class JournalsForMessage < ActiveRecord::Base
   def reference_user
     User.find(reply_id)
   end
+
+  def delete_by_user?user
+    # 用户可删除自己的留言
+    if self.user.id == user.id || user.admin?
+      return true
+    else
+      return false
+    end
+  end
   
   def self.reference_message(user_id)
     @user = User.find(user_id)
diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb
index 90803fdd0..903b0b5fc 100644
--- a/app/views/courses/feedback.html.erb
+++ b/app/views/courses/feedback.html.erb
@@ -78,6 +78,9 @@ function checkMaxLength() {
 							'#{l(:label_reply_plural)} #{journal.user.name}: '); 
 							return false;"} %>
 			<% end %>
+              <% if journal.delete_by_user?(User.current) %>
+				<%= link_to(l(:button_delete), {:controller => 'words', :action => 'destroy',  :object_id => journal, :user_id => journal.user}, :method => :delete,:remote => true)%>
+			<% end %>
 			</span> 
 		</span>
 		<div style="clear: both;"></div>