Chihyu
/
personal-research
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

add link to member's front page for both index and show views

add link to member's front page for both index and show views

See merge request !1
This commit is contained in:
EricTYL 2020-01-02 17:11:17 +08:00
parent cb715732e7 77e39ccdaa
commit c2bba77a78
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/personal_researches_controller.rb
View File

@ -2,8 +2,10 @@ class PersonalResearchesController < ApplicationController
def index def index
researchs = Research.where(:is_hidden=>false).order_by(:year=>'desc').page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) researchs = Research.where(:is_hidden=>false).order_by(:year=>'desc').page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
research_list = researchs.collect do |research| research_list = researchs.collect do |research|
member = research.member_profile
path = OrbitHelper.url_to_plugin_show(member.to_param, 'member') rescue '#'
{ {
"member" => (research.member_profile.name rescue ""), "member" => "<a href='#{path}'>#{member.name}</a>",
"year" => research.year, "year" => research.year,
"publication_date" => (research.publish_date.strftime("%Y.%m") rescue ""), "publication_date" => (research.publish_date.strftime("%Y.%m") rescue ""),
"research_title" => research.research_title, "research_title" => research.research_title,

3
app/models/research.rb
View File

@ -110,6 +110,9 @@ class Research
files << "<li><a href='#{url}' target='_blank'>#{title}</li>" files << "<li><a href='#{url}' target='_blank'>#{title}</li>"
end end
value = files.join("") value = files.join("")
when "authors"
path = OrbitHelper.url_to_plugin_show(self.member_profile.to_param, 'member') rescue '#'
value = "<a href='#{path}'>#{self.member_profile.name}</a>"
else else
value = self.send(field) rescue "" value = self.send(field) rescue ""
end end