From d9928096236dc56ca14ff6814fef3989769026c6 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 Nov 2015 17:19:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 603ca6857..87342bf9c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -605,7 +605,7 @@ ActiveRecord::Schema.define(:version => 20151127011351) do
   end
 
   create_table "exercise_questions", :force => true do |t|
-    t.string   "question_title"
+    t.text     "question_title"
     t.integer  "question_type"
     t.integer  "question_number"
     t.integer  "exercise_id"
@@ -634,7 +634,7 @@ ActiveRecord::Schema.define(:version => 20151127011351) do
   end
 
   create_table "exercises", :force => true do |t|
-    t.string   "exercise_name"
+    t.text     "exercise_name"
     t.text     "exercise_description"
     t.integer  "course_id"
     t.integer  "exercise_status"
@@ -1151,10 +1151,6 @@ ActiveRecord::Schema.define(:version => 20151127011351) do
   create_table "org_members", :force => true do |t|
     t.integer  "user_id"
     t.integer  "organization_id"
-<<<<<<< HEAD
-    t.string   "role"
-=======
->>>>>>> 1ae514ca4857d7e2ad53b338731c1e01f899fb4d
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end

From b6166120326338cb53e5a92d57efbc39bcd186a3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 Nov 2015 17:57:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E8=BF=98=E5=8E=9F=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_head.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb
index b69f52a56..64f34b5aa 100644
--- a/app/views/exercise/_edit_head.html.erb
+++ b/app/views/exercise/_edit_head.html.erb
@@ -20,7 +20,7 @@
         <a class="btn_submit c_white" data-button="ok" onclick="pollsSubmit($(this));">
           保存
         </a>
-        <a class="btn_cancel" data-button="cancel" onclick="resetHead();pollsCancel();">
+        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
           <%= l(:button_cancel)%>
         </a>
       </div>
@@ -35,6 +35,6 @@
         $("#exercise_time").val("<%=exercise.time if exercise.time!= -1 %>");
         $("#exercise_publish_time").val("<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil?%>");
         /*$("#exercise_description").text("<%#=exercise.exercise_description.html_safe %>");*/
-        document.getElementById("exercise_description").innerText = <%=exercise.exercise_description.html_safe %>;
+        document.getElementById("exercise_description").innerHTML = <%=exercise.exercise_description.html_safe %>;
     }
 </script>
\ No newline at end of file