From b46561dac1fe3c0083b8550980d6aa08d28c9a80 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 Nov 2015 10:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A=E6=97=B6?=
 =?UTF-8?q?=E8=8B=A5=E4=BD=9C=E5=93=81=E5=90=8D=E7=A7=B0=E5=92=8C=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E6=8F=8F=E8=BF=B0=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=88=99?=
 =?UTF-8?q?=E4=B8=8D=E5=BC=B9=E5=87=BA=E4=BD=9C=E5=93=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/edit.html.erb | 13 ++++++++-----
 app/views/student_work/new.html.erb  | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index 517a238b0..d506b5542 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -62,10 +62,13 @@
 </div>
 <script type="text/javascript">
     function popupRegex(){
-        $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-        showModal('ajax-modal', '500px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').parent().css("top","").css("left","");
-        $('#ajax-modal').parent().addClass("anonymos");
+        if(regexStudentWorkName()&&regexStudentWorkDescription())
+        {
+            $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+            showModal('ajax-modal', '500px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').parent().addClass("anonymos");
+        }
     }
 </script>
\ No newline at end of file
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index fdf1e31a3..4f9999277 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -121,10 +121,13 @@
 </div>
 <script type="text/javascript">
   function popupRegex(){
-      $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-      showModal('ajax-modal', '500px');
-      $('#ajax-modal').siblings().remove();
-      $('#ajax-modal').parent().css("top","").css("left","");
-      $('#ajax-modal').parent().addClass("anonymos");
+      if(regexStudentWorkName()&&regexStudentWorkDescription())
+      {
+          $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+          showModal('ajax-modal', '500px');
+          $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').parent().css("top","").css("left","");
+          $('#ajax-modal').parent().addClass("anonymos");
+      }
   }
 </script>
\ No newline at end of file