From fc244982bc4ee729bbc4a49674829685064ad19c Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 15 Aug 2015 17:06:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8F=E8=A7=88=E5=99=A8=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/poll.rb | 3 ++- public/stylesheets/public_new.css | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/poll.rb b/app/models/poll.rb index f9ed43720..62f91380b 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -36,9 +36,10 @@ class Poll < ActiveRecord::Base def act_as_course_activity if self.polls_type == "Course" if self.polls_status == 2 #问卷是发布状态 - self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id) + self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id) elsif self.polls_status == 1 #问卷是新建状态 self.course_acts.destroy_all + end end end diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css index ca45545ff..83e8189b3 100644 --- a/public/stylesheets/public_new.css +++ b/public/stylesheets/public_new.css @@ -7,7 +7,7 @@ table,tr,td{border:0;cellspacing:0; cellpadding:0;} ol,ul,li{ list-style-type:none} a:link,a:visited{color:#7f7f7f;text-decoration:none;} a:hover,a:active{color:#15bccf;} -img{max-width: 100%;} +/*img{max-width: 100%;}*/ /*常用*/ select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }