From 9d36c74d7f078c89d439a3bd8bed6a2cebd406b4 Mon Sep 17 00:00:00 2001 From: cxt Date: Sun, 12 Jun 2016 14:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=9B=9E=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/words_controller.rb | 2 +- app/views/users/_homework_replies.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index fa084e349..22b7f1f52 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -106,7 +106,7 @@ class WordsController < ApplicationController elsif @journal_destroyed.jour_type == 'HomeworkCommon' @homework = HomeworkCommon.find @journal_destroyed.jour_id if params[:user_activity_id] - @user_activity_id = params[:user_activity_id] + @user_activity_id = params[:user_activity_id].to_i else @user_activity_id = -1 end diff --git a/app/views/users/_homework_replies.html.erb b/app/views/users/_homework_replies.html.erb index de6e96ae3..7f4dc379b 100644 --- a/app/views/users/_homework_replies.html.erb +++ b/app/views/users/_homework_replies.html.erb @@ -63,7 +63,7 @@ <% if User.current.admin? ||is_teacher || comment.user == User.current%> - <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :course_activity => course_activity}, + <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity}, :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) %> <% end %>