From 0a0d67642a090781a86f921c2e83ffb8fc465e16 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 3 Feb 2016 12:17:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb |  2 ++
 app/views/users/user_select_homework.js.erb  | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 7a5bd8f27..0d542882a 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -16,6 +16,7 @@
             $("#GroupPopupBox a.group_save_btn").click();
         <% end %>
       });
+      var homework_description_editor;
       function checked_val() {
           if ($("#anonymous_comment").is(":checked")) {
               $("#anonymous_comment").val(1);
@@ -124,6 +125,7 @@
               params.submit_btn = $("#new_message_submit_btn");
               if(params.textarea.data('init') == undefined) {
                   params.editor = init_homework_editor(params);
+                  homework_description_editor = params.editor;
                   init_homework_form(params);
                   params.submit_btn.click(function () {
                       params.form.submit();
diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index 306374b84..21fd9db26 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -8,11 +8,13 @@ $("#homework_end_time").val("<%= @homework.end_time%>");
 $("#ref_homework_id").val("<%= @ref_homework.id%>");
 $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true,:has_group => true,:show_member=>true})%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
-<% if @homework_detail_group %>
-    $('span.group_detail_info').text('分组人数：<%=@homework_detail_group.min_num %>-<%=@homework_detail_group.max_num %> 人');
-<% end %>
-$("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
-$("#GroupPopupBox").html("<%=escape_javascript( render :partial => 'users/user_group_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
 //$("input[name='homework_type']").val("<%#= @homework.homework_type%>");
+<% if @homework_detail_programing %>
+    $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
+    $("#BluePopupBox a.BlueCirBtn").click();
+<% elsif @homework_detail_group %>
+    $('span.group_detail_info').text('分组人数：<%=@homework_detail_group.min_num %>-<%=@homework_detail_group.max_num %> 人');
+    $("#GroupPopupBox").html("<%=escape_javascript( render :partial => 'users/user_group_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
+    $("#GroupPopupBox a.group_save_btn").click();
+<% end %>
 $("#homework_editor").show();
-$("#BluePopupBox a.BlueCirBtn").click();