From ec00b86c15a7eae6a02eba1c2519e6088909bc62 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 Nov 2015 15:17:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A4=9A=E6=AC=A1=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E5=93=81=E6=97=B6=E6=8F=90=E9=86=92=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    | 10 ++++++--
 .../student_work/_has_commit_work.html.erb    | 24 +++++++++++++++++++
 app/views/student_work/create.js.erb          | 10 +++++++-
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 app/views/student_work/_has_commit_work.html.erb

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 87d13e169..7eac379e4 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -168,9 +168,15 @@ class StudentWorkController < ApplicationController
 
   def create
     # 提交作品前先判断是否已经提交
+    @has_commit = false;
     if hsd_committed_work?(User.current.id, @homework.id)
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to edit_student_work_url(params[:student_work])
+      @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
+      @has_commit = true;
+      #flash[:notice] = l(:notice_successful_create)
+      #redirect_to edit_student_work_url(params[:student_work])
+      respond_to do |format|
+        format.js
+      end
       return
     end
     if params[:student_work]
diff --git a/app/views/student_work/_has_commit_work.html.erb b/app/views/student_work/_has_commit_work.html.erb
new file mode 100644
index 000000000..d324f3aaf
--- /dev/null
+++ b/app/views/student_work/_has_commit_work.html.erb
@@ -0,0 +1,24 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <div><p align='center' style='margin-top: 35px'>您已提交过作品，请不要重复提交，如果想修改作品请点击编辑。</p></div>
+    <div class="cl"></div>
+    <div class="ni_btn mt10">
+      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
+        编&nbsp;&nbsp;辑
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 15px;margin-top:15px;" >
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    function clickOK() {
+        window.location.href = '<%= edit_student_work_path(@work.id)%>';
+    }
+    function clickCanel() {
+        hideModal('#popbox02');
+        window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/create.js.erb b/app/views/student_work/create.js.erb
index 42b1db8b8..afd8617aa 100644
--- a/app/views/student_work/create.js.erb
+++ b/app/views/student_work/create.js.erb
@@ -1,4 +1,12 @@
-<% if @submit_result%>
+<% if @has_commit %>
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/has_commit_work') %>');
+    showModal('ajax-modal', '500px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+            "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    $('#ajax-modal').parent().css("top","").css("left","");
+    $('#ajax-modal').parent().addClass("anonymos");
+<% elsif @submit_result%>
     $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
     showModal('ajax-modal', '500px');
     $('#ajax-modal').siblings().remove();