Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll

app/controllers/poll_controller.rb

@@ -46,9 +46,7 @@ class PollController < ApplicationController
       }
       @poll = Poll.create option
       if @poll
-        respond_to do |format|
+        redirect_to edit_poll_url @poll.id
-          format.html{render :layout => 'base_courses'}
-        end
       end
     elsif @project
       #项目的问卷调查相关代码