scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-07 05:03:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3087 from urbanrotnik/ur-sci-5397-folder-link-in-activities

Browse source 
Fix folder's activities links [SCI-5397]
This commit is contained in:
Urban Rotnik 2021-01-15 13:52:55 +01:00 committed by GitHub
commit 2fa54d7898
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/global_activities_helper.rb
View file

@ -88,7 +88,7 @@ module GlobalActivitiesHelper
when Report
path = reports_path(team: obj.team.id)
when ProjectFolder
path = projects_path
path = project_folder_path(obj, team: obj.team.id)
else
return current_value
end

2
app/views/global_activities/references/_project_folder.html.erb
View file

@ -4,7 +4,7 @@
<span class="fas fa-folder"></span>
<% if subject %>
<% path = projects_path(team: team) %>
<% path = project_folder_path(subject, team: team) %>
<%= route_to_other_team(path,
team,
subject.name&.truncate(Constants::NAME_TRUNCATION_LENGTH),