From f46985c8bcdd3e86b07b387af478286ef1f9ef2b Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 28 Mar 2016 17:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E7=82=B9=E8=B5=9E=E6=8A=A550?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_programing_work_show.html.erb | 2 +- app/views/student_work/_show.html.erb | 2 +- app/views/student_work/_student_work_praise.html.erb | 6 +++--- app/views/student_work/praise_student_work.js.erb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb index 6009dfbb5..cf5866bc6 100644 --- a/app/views/student_work/_programing_work_show.html.erb +++ b/app/views/student_work/_programing_work_show.html.erb @@ -18,7 +18,7 @@ <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
  • - <%= render :partial => 'student_work_praise' %> + <%= render :partial => 'student_work_praise',:locals => {:work => work} %>
  • <% end%>
    diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb index 67c04d71f..dc2fdafb6 100644 --- a/app/views/student_work/_show.html.erb +++ b/app/views/student_work/_show.html.erb @@ -25,7 +25,7 @@ <% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %>
  • - <%= render :partial => 'student_work_praise' %> + <%= render :partial => 'student_work_praise',:locals => {:work => work} %>
  • <% end%>
    diff --git a/app/views/student_work/_student_work_praise.html.erb b/app/views/student_work/_student_work_praise.html.erb index f03bbdcc1..8796244ea 100644 --- a/app/views/student_work/_student_work_praise.html.erb +++ b/app/views/student_work/_student_work_praise.html.erb @@ -1,5 +1,5 @@ -<% if is_praise_homework User.current.id,@work.id %> - <%= link_to "赞(#{praise_homework_count @work.id})",praise_student_work_student_work_path(@work), :remote => true,:class => 'orange_btn', :style => 'font-size:12px;'%> +<% if is_praise_homework User.current.id,work.id %> + <%= link_to "赞(#{praise_homework_count work.id})",praise_student_work_student_work_path(work), :remote => true,:class => 'orange_btn', :style => 'font-size:12px;'%> <% else %> - <%= link_to "赞(#{praise_homework_count @work.id})","javascript:void(0)",:class => 'grey_btn', :style => 'font-size:12px;'%> + <%= link_to "赞(#{praise_homework_count work.id})","javascript:void(0)",:class => 'grey_btn', :style => 'font-size:12px;'%> <% end %> \ No newline at end of file diff --git a/app/views/student_work/praise_student_work.js.erb b/app/views/student_work/praise_student_work.js.erb index c58eb5a2f..d0916cdc2 100644 --- a/app/views/student_work/praise_student_work.js.erb +++ b/app/views/student_work/praise_student_work.js.erb @@ -1 +1 @@ -$('#student_work_praise_<%= @work.id%>').html('<%= escape_javascript(render :partial => 'student_work/student_work_praise')%>'); \ No newline at end of file +$('#student_work_praise_<%= @work.id%>').html('<%= escape_javascript(render :partial => 'student_work/student_work_praise', :locals => {:work => @work})%>'); \ No newline at end of file