From 851b468e8d875c29e344e6e2ea9aeda955042fb8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 10 Jul 2015 10:05:28 +0800
Subject: [PATCH] =?UTF-8?q?admin=E8=83=BD=E8=AE=BF=E9=97=AE=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index d8a9d88c3..758747e02 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -23,7 +23,7 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
-    if @poll.polls_status != 2 && !User.current.allowed_to?(:as_teacher,@course)
+    if @poll.polls_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?)
       render_403
       return
     end
@@ -393,7 +393,7 @@ class PollController < ApplicationController
   end
 
   def is_member_of_course
-    render_403 unless(@course && User.current.member_of_course?(@course))
+    render_403 unless(@course && (User.current.member_of_course?(@course) || User.current.admin?))
   end
 
   def is_course_teacher