当教师只评分不评论时,学生可以进行回复

修改作业评论回复框样式不正确,修改项目用户反馈框显示不正确
memcached_alan
sw 10 years ago
parent 03044d0190
commit 0970182cd5

@ -473,8 +473,10 @@ class HomeworkAttachController < ApplicationController
#保存评论
@is_comprehensive_evaluation = @is_teacher ? 1 : (@is_anonymous_comments ? 2 : 3) #判断当前评论是老师评论?匿评?留言
if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" #有没有留言
@homework.addjours User.current.id, params[:new_form][:user_message],0,@is_comprehensive_evaluation
if params[:new_form] && params[:new_form][:user_message] #有没有留言
@homework.addjours(User.current.id, params[:new_form][:user_message],0,@is_comprehensive_evaluation) if @is_teacher
else
@homework.addjours User.current.id, "",0,@is_comprehensive_evaluation if @is_teacher
end
@teacher_stars = @stars_reates.where("is_teacher_score = 1") #老师评分列表

@ -56,7 +56,7 @@ class JournalsForMessage < ActiveRecord::Base
has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
validates :notes, presence: true
validates :notes, presence: true, if: :is_homework_jour?
after_create :act_as_activity #huang
after_create :reset_counters!
after_destroy :reset_counters!
@ -88,6 +88,10 @@ class JournalsForMessage < ActiveRecord::Base
self.find(message_id).destroy
# self.destroy_all "id = #{message_id}"
end
def is_homework_jour?
self.jour_type != "HomeworkAttach"
end
def reference_user
User.find(reply_id)

@ -40,7 +40,7 @@
<div class="cl"></div>
<div id='<%=id%>' class="respond-form">
<% if reply_allow %>
<% if journal.jour_type == "Course" %>
<% if journal.jour_type == "Course" || journal.jour_type == "Project" %>
<%= render :partial => "words/new_respond_course", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
<% else %>
<%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>

@ -1,5 +1,5 @@
<%= form_tag(words_create_reply_path, :remote => true) do %>
<%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
<%= text_area_tag 'user_notes', "", :class => 'noline',
:style => "resize: none;", :rows => 4,
:placeholder => l(:label_feedback_respond_content),
:maxlength => 250 %>
@ -9,7 +9,7 @@
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
<%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
<%= submit_tag l(:button_feedback_respond), :name => nil ,
:class => "reply_btn",
:class => "enterprise",
:style => "float: right; margin-top: 1px; margin-right: 4px;"%>
<% end %>
Loading…
Cancel
Save