From 3efc158fb5ba4ea90831b01f233c67a871925ac0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 8 Sep 2016 10:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E4=B8=9A=EF=BC=9A?=
 =?UTF-8?q?=E5=BD=93=E5=B7=B2=E7=BB=8F=E5=8F=91=E5=B8=83=E4=BA=86=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=86=8D=E5=8E=BB=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=98=AF=E2=80=9C=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=B6=E9=97=B4=E2=80=9D=E5=B0=B1=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=86=8D=E7=BC=96=E8=BE=91=E4=BA=86=EF=BC=8C=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=A4=E6=96=AD=E5=8F=AA=E6=9C=89=E5=BD=93?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=B7=B2=E7=BB=8F=E6=8F=90=E4=BA=A4=E4=BA=86?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=88=96=E5=85=B3=E8=81=94=E4=BA=86=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=89=8D=E7=A6=81=E6=AD=A2=E5=86=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=EF=BC=8C=E4=B8=94=E8=A6=81?=
 =?UTF-8?q?=E7=BB=99=E5=87=BA=E5=BF=85=E8=A6=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/clear_user_avatar_temp.js.erb   | 4 ++--
 app/views/users/_user_homework_form.html.erb | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/my/clear_user_avatar_temp.js.erb b/app/views/my/clear_user_avatar_temp.js.erb
index 1d1ef48f0..3278adcb5 100644
--- a/app/views/my/clear_user_avatar_temp.js.erb
+++ b/app/views/my/clear_user_avatar_temp.js.erb
@@ -2,7 +2,7 @@
     $('#ajax-modal').html($("#nh_tx_dialog_html").html());
     showModal('ajax-modal','460px');
     $('#ajax-modal').siblings().hide();
-    $('#ajax-modal').parent().removeClass("alert_praise");
-    //$('#ajax-modal').parent().css("top","").css("left","");
+    $('#ajax-modal').parent().removeClass("alert_praise").removeClass("copyCoursePopup");
+    $('#ajax-modal').parent().css("top","30%").css("left","40%");
     $('#ajax-modal').parent().addClass("alert_box");
     $('#ajax-modal').parent().css("border", "3px solid #269ac9").css("border-radius", "0").css(" -webkit-border-radius", "0").css(" -moz-border-radius", "0");
\ No newline at end of file
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 9457ae3ed..b3f9970c6 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -177,8 +177,9 @@
         <label class="fl c_grey f14" style="margin-top: 4px;">发布日期(可选)：</label>
     <%# end %>
     <div class="calendar_div fl">
-      <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.publish_time%>"  >
-      <% if homework.homework_detail_manual.comment_status.to_i == 0 %>
+      <% allow_edit = homework.student_works.has_committed.count == 0 && homework.student_work_projects.count ==0 %>
+      <input title="<%=allow_edit ? '' : '已有学生提交作品或关联项目，发布日期不可再编辑' %>" type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.publish_time%>"  >
+      <% if allow_edit %>
         <%= calendar_for('homework_publish_time')%>
       <% end %>
     </div>