Merge branch 'master' into 'master'

fix string+nil problem



See merge request !4
This commit is contained in:
wmcheng 2019-11-18 23:32:29 +08:00
commit d44b0bf475
1 changed files with 1 additions and 1 deletions

View File

@ -88,7 +88,7 @@ class Patent
fields_to_show.collect do |t|
case t
when "patent_title"
pd_data << {"data_title" => "<a href='#{OrbitHelper.url_to_plugin_show(p.to_param,'personal_patent')}' title='" + (p.send(t) rescue "") +"' target='_blank'>" + (p.send(t) rescue "") + "</a>"}
pd_data << {"data_title" => "<a href='#{OrbitHelper.url_to_plugin_show(p.to_param,'personal_patent')}' title='#{p.patent_title}' target='_blank'> #{p.patent_title} </a>"}
when "publish_date"
pd_data << {"data_title" => (p.publish_date.strftime("%Y/%m/%d") rescue "")}
when "application_date"