diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index c53f09361..1bf6b3716 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -34,7 +34,7 @@
 <li>
   <%if @is_teacher %>
     <% if poll.polls_status == 1 %>
-      <a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>);">发布问卷</a>
+      <a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>,<%= poll.polls_name.length %>);">发布问卷</a>
     <% elsif poll.polls_status == 2%>
       <a href="#" class="pollsbtn btn_de fl ml5" onclick="republish_poll(<%= poll.id%>);">取消发布</a>
     <% end%>
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index a8aca1308..3962768da 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -26,28 +26,35 @@
 
     function clickCanel(){hideModal("#popbox02");}
 
-    function poll_submit(poll_id)
+    function poll_submit(poll_id,poll_name)
     {
-        $('#ajax-modal').html("<div id='popbox02'>" +
-            "<div class='upload_con'>" +
-                "<div class='upload_box'>" +
+        if(poll_name == 0)
+        {
+            alert("问卷标题不能为空");
+        }
+        else
+        {
+            $('#ajax-modal').html("<div id='popbox02'>" +
+                    "<div class='upload_con'>" +
+                    "<div class='upload_box'>" +
                     "<p class='polls_box_p'>问卷发布后将不能对问卷进行修改，<br />是否确定发布该问卷？</p>" +
                     "<div class='polls_btn_box'>" +
-                        "<a href='/poll/"+ poll_id +"/publish_poll' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
-                        "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                    "<a href='/poll/"+ poll_id +"/publish_poll' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                    "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
                     "</div>" +
                     "<div class='cl'></div>" +
-                "</div>" +
-            "</div>" +
-        "</div>");
-        showModal('ajax-modal', '310px');
-        $('#ajax-modal').css('height','115px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-                "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-        $('#ajax-modal').parent().removeClass("alert_praise");
-        $('#ajax-modal').parent().css("top","").css("left","");
-        $('#ajax-modal').parent().addClass("popbox_polls");
+                    "</div>" +
+                    "</div>" +
+                    "</div>");
+            showModal('ajax-modal', '310px');
+            $('#ajax-modal').css('height','115px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                    "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+            $('#ajax-modal').parent().removeClass("alert_praise");
+            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').parent().addClass("popbox_polls");
+        }
     }
 </script>
 <div class="polls_content" id="polls" style="width:677px;">
diff --git a/config/application.rb b/config/application.rb
index 2f1534d00..7e47cc64e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,9 +17,9 @@ module RedmineApp
     # -- all .rb files in that directory are automatically loaded.
 
     # verifier if email is real
-    EmailVerifier.config do |config|
-      config.verifier_email = "lizanle521@126.com"
-    end
+    #EmailVerifier.config do |config|
+    #  config.verifier_email = "lizanle521@126.com"
+    #end
 
     config.generators do |g|
          g.test_framework :rspec,
diff --git a/db/schema.rb b/db/schema.rb
index d0d755bd3..20c74ba1e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150121030451) do
+ActiveRecord::Schema.define(:version => 20150123020615) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -23,18 +23,6 @@ ActiveRecord::Schema.define(:version => 20150121030451) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -844,9 +832,10 @@ ActiveRecord::Schema.define(:version => 20150121030451) do
     t.integer  "user_id"
     t.datetime "published_at"
     t.datetime "closed_at"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
     t.text     "polls_description"
+    t.integer  "show_result",       :default => 1
   end
 
   create_table "praise_tread_caches", :force => true do |t|