scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-10 09:23:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7406 from wandji20/wb-SCI-10560

Browse source 
Add archived tag to protocol liked tasks modal items [SCI-10560]
This commit is contained in:
ajugo 2024-04-02 10:32:32 +02:00 committed by GitHub
commit c4a02538fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/protocols_controller.rb
View file

@ -129,13 +129,13 @@ class ProtocolsController < ApplicationController
project_folder = record.my_module.experiment.project.project_folder
{
my_module_name: record.my_module.name,
experiment_name: record.my_module.experiment.name,
project_name: record.my_module.experiment.project.name,
my_module_name: record.my_module.name_with_label,
experiment_name: record.my_module.experiment.name_with_label,
project_name: record.my_module.experiment.project.name_with_label,
my_module_url: protocols_my_module_path(record.my_module),
experiment_url: my_modules_path(experiment_id: record.my_module.experiment.id),
project_url: experiments_path(project_id: record.my_module.experiment.project.id),
project_folder_name: project_folder.present? ? project_folder.name : nil,
project_folder_name: project_folder.present? ? project_folder.name_with_label : nil,
project_folder_url: project_folder.present? ? project_folder_projects_url(project_folder) : nil
}
},

4
app/models/project.rb
View file

@ -322,6 +322,10 @@ class Project < ApplicationRecord
report.destroy if report.present?
end
def archived_branch?
archived?
end
private
def project_folder_team