From 7f133c860ad0472771c860398ddbe043e246361a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 25 Dec 2015 15:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=92=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=97=B6=E5=8F=AF=E8=AE=BE=E7=BD=AE=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=90=AF=E7=94=A8=E5=8C=BF=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb |  1 +
 app/controllers/users_controller.rb           |  1 +
 app/views/homework_common/index.html.erb      |  1 +
 app/views/users/_user_homework_form.html.erb  | 22 +++++++++++++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 048f62296..46362c2d3 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -63,6 +63,7 @@ class HomeworkCommonController < ApplicationController
       end
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
+      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
 
       homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
       if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 281b8b7e0..f26f6c118 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -522,6 +522,7 @@ class UsersController < ApplicationController
         else
           homework.publish_time = params[:homework_common][:publish_time]
         end
+        homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
         homework.homework_type = params[:homework_type].to_i || 1
         homework.late_penalty = 10
         homework.teacher_priority = 1
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 010bc8ec9..bc960154e 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -3,6 +3,7 @@
         $("#homework_name").val("");
         $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
+        document.getElementById("anonymous_comment").checked = true;
         $("#course_id").val($("#option_select").val());
         $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>");
         homework_description_editor.html("");
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index a060cf386..29be69a23 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -4,11 +4,23 @@
     <%= javascript_include_tag 'homework','baiduTemplate' %>
     <script type="text/javascript">
       $(function(){
+        if($.trim($("#anonymous_comment").val()) == 1) {
+            $("#anonymous_comment").attr('checked',false);
+        } else {
+            $("#anonymous_comment").attr('checked',true);
+        }
         $("#BluePopupBox a.BlueCirBtn").click();
         <% if edit_mode && homework.is_group_homework? %>
             $("#GroupPopupBox a.group_btn").click();
         <% end %>
       });
+      function checked_val() {
+          if ($("#anonymous_comment").is(":checked")) {
+              $("#anonymous_comment").val(0);
+          } else {
+              $("#anonymous_comment").val(1);
+          }
+      }
     </script>
 <% end %>
 
@@ -39,6 +51,12 @@
         <%= calendar_for('homework_publish_time')%>
       <% end %>
     </div>
+    <% if !edit_mode || edit_mode && homework.homework_detail_manual.comment_status < 2 %>
+        <div class="fl f14 ml10" style="margin-top: 4px;">
+          <input type="checkbox" name="homework_common[anonymous_comment]" checked="checked" value="<%=edit_mode ? homework.anonymous_comment : 0 %>" id="anonymous_comment"/>
+          <span class="f14 c_grey mr10">启用匿评</span>
+        </div>
+    <% end %>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>
@@ -68,12 +86,12 @@
 
     <div class="mt5">
       <% if edit_mode %>
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="checked_val();submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
           <span class="fr mr10 mt3">或</span>
           <%#= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
           <a href="javascript:void(0);" class="fr mr10 mt3" onclick="cancel_edit();">取消</a>
     <% else %>
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="checked_val();submit_homework('new_homework_common');">发送</a>
           <span class="fr mr10 mt3">或</span>
           <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
       <% end %>