Skip to content

Commit 9dba47e

Browse files
committed
Streamline shared publication registers
1 parent 99f6d7f commit 9dba47e

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

app/models/register.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,15 @@ def update_name_order
299299
names.map(&:update_name_order)
300300
end
301301

302+
def registers_with_shared_publication
303+
return unless publication.present?
304+
if validated?
305+
publication.registers.where(validated: true) - [self]
306+
else
307+
publication.registers - [self]
308+
end
309+
end
310+
302311
def merge_into(main_register, user)
303312
# Assertions
304313
errors.add(

app/views/registers/_alert_messages.html.erb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@
2323
</div>
2424
<% end %>
2525

26-
<% if @register.publication.try(:registers).present? &&
27-
@register.publication.registers.count > 1 %>
26+
<% if @register.registers_with_shared_publication.present? %>
2827
<div class="alert alert-<%= @register.validated? ? :info : :warning %>">
2928
<h4>Effective publication associated to multiple register lists</h4>
3029
The effective publication of this list
3130
(<%= @register.publication.short_citation %>) is also associated with:
3231
<ul>
33-
<% @register.publication.registers.each do |register| %>
34-
<% next if register == @register %>
32+
<% @register.registers_with_shared_publication.each do |register| %>
3533
<li><%= display_link(register) %>: <%= register.propose_title %></li>
3634
<% end %>
3735
</ul>

0 commit comments

Comments
 (0)