gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into error_opening_revision_history

Browse source
This commit is contained in:
James Mason 2017-10-19 12:11:32 -07:00 • committed by GitHub
commit 23805abffe
34 changed files with 144 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/versions/_object_desc_and_link.html.haml
View file

@ -22,7 +22,7 @@
- else
- conference = Conference.find_by(id: version.conference_id)
- conference_short_title = conference.try(:short_title) || current_or_last_object_state('Conference', version.conference_id).try(:short_title) || ' '
= link_if_alive version, role.try(:name), admin_conference_role_path(role.try(:name) || ' ', conference_short_title), conference
= link_if_alive version, role.try(:name), admin_conference_role_path(conference_short_title,role.try(:name) || ' '), conference
= version.event == 'create' ? 'to' : 'from'
user