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

included name

Browse source
This commit is contained in:
Giga Chubinidze 2023-06-08 12:54:01 +04:00
parent aa5caf3cc3
commit 95437c69a4
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/archivable_model.rb
View file

@ -50,7 +50,9 @@ module ArchivableModel
def name_with_label def name_with_label
raise NotImplementedError, "Archivable model must implement the '.archived_branch?' method!" unless respond_to?(:archived_branch?) raise NotImplementedError, "Archivable model must implement the '.archived_branch?' method!" unless respond_to?(:archived_branch?)
I18n.t("labels.archived") if self.archived_branch? return (parent&.name || name).prepend(I18n.t("labels.archived")) if archived_branch?
parent&.name || name
end end
protected protected

2
app/views/my_modules/protocols/_protocol_status_bar.html.erb
View file

@ -18,7 +18,7 @@
<div class="dropdown-content"> <div class="dropdown-content">
<div class="dropdown-header"> <div class="dropdown-header">
<h2 class="protocol-name"> <h2 class="protocol-name">
<%= @protocol.name_with_label %>&nbsp;<%= @protocol.parent&.name || @protocol.name %> <%= @protocol.name_with_label %>
</h2> </h2>
<% if @protocol.linked? %> <% if @protocol.linked? %>
<div class="protocol-header-info"> <div class="protocol-header-info">

2
config/locales/en.yml
View file

@ -431,7 +431,7 @@ en:
step_url: "Go to step" step_url: "Go to step"
labels: labels:
archived: "(A)" archived: "(A) "
projects: projects:
index: index: