developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
iCross 2013-05-25 10:05:19 +08:00
parent d4962d20b3
commit 88c57e0b0c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/built_in_modules/survey/app/models/survey.rb vendored
View File

@ -43,12 +43,12 @@ class Survey
def time_range
r = "#{self.postdate.to_date}"
r += "- #{self.deadline.to_date}" unless self.deadline.nil?
r += "- #{self.deadline.to_date}" if self.deadline
r
end
def result
if ( self.result_type == Survey::ResultChart && Time.now > self.deadline ) ||
if ( self.result_type == Survey::ResultChart && self.deadline && Time.now > self.deadline ) ||
( self.result_type == Survey::ResultExtern && !self.extern_link.blank? ) ||
( self.result_type == Survey::ResultFile && self.upload_file? )
('<a href="'+Rails.application.routes.url_helpers.result_panel_survey_front_end_survey_path(self) + '"><img src="/assets/result.png" /></a>').html_safe
@ -58,7 +58,7 @@ class Survey
end
def write
if Time.now < self.deadline
if self.deadline || Time.now < self.deadline
('<a href="' + Rails.application.routes.url_helpers.panel_survey_front_end_survey_path(self) + '"><img src="/assets/write.png" /></a>').html_safe
else
''