From cd20c50152049ad78068723af445ddcdb1328522 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 30 Mar 2016 16:20:51 +0800 Subject: [PATCH] show period fix --- app/models/project.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 62e8b70..58c7924 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -37,7 +37,11 @@ class Project scope :sort_for_frontend, ->{ where(:is_hidden=>false).order_by(:year=>'desc', :period_start_date=>'desc') } def duration - "#{self.period_start_date.strftime("%Y.%m") rescue ""} ~ #{self.period_end_date.strftime("%Y.%m") rescue ""}" + if !self.send('period_start_date').nil? or !self.send('period_end_date').nil? + date = (self.send('period_start_date').strftime('%Y.%m') rescue "")+' ~ '+(self.send('period_end_date').strftime('%Y.%m') rescue I18n.t('personal_project.up_to_today')) + else + date = "" + end end def self.get_plugin_datas_to_member(datas)