Skip to content

Commit 648188b

Browse files
committed
Clean style for optional flags
1 parent 6355654 commit 648188b

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

app/helpers/names_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ def name_lineage(name, links: true, last: true, register: nil, visited: [])
6161

6262
# Display the current name
6363
if links && !last
64-
out << link_to(name.name_html(nil, assume_valid), name)
64+
out << link_to(name.name_html(assume_valid: assume_valid), name)
6565
else
66-
out << name.name_html(nil, assume_valid)
66+
out << name.name_html(assume_valid: assume_valid)
6767
end
6868

6969
out.inject(:+)

app/models/name.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ def abbr_name_raw(name = nil, assume_valid = false)
496496
end
497497
end
498498

499-
def name_html(name = nil, assume_valid = false, check_correctness = false)
499+
def name_html(name: nil, assume_valid: false, check_correctness: false)
500500
name = sanitize(name || self.name)
501501
if candidatus?
502502
name.gsub(/^Candidatus /, '<i>Candidatus</i> ').html_safe
@@ -517,19 +517,19 @@ def name_html(name = nil, assume_valid = false, check_correctness = false)
517517
end
518518

519519
def name_html_correctness
520-
name_html(nil, false, true)
520+
name_html(assume_valid: false, check_correctness: true)
521521
end
522522

523523
def abbr_corr_name
524524
abbr_name(corrigendum_from)
525525
end
526526

527527
def corr_name_html
528-
name_html(corrigendum_from)
528+
name_html(name: corrigendum_from)
529529
end
530530

531-
def formal_html(check_correctness = false)
532-
y = name_html(nil, false, check_correctness)
531+
def formal_html(assume_valid: false, check_correctness: false)
532+
y = name_html(assume_valid: assume_valid, check_correctness: check_correctness)
533533
y = "&#8220;#{y}&#8221;" if candidatus?
534534
y += ' <i>corrig.</i>'.html_safe if corrigendum_from?
535535
if not_validly_proposed_in.any?

app/views/names/_name_pdf.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<div class="avoid-page-break">
44
<h2 class="no-sticky">
55
<%= name.inferred_rank.capitalize %>
6-
<%= name.name_html(nil, true) %>
6+
<%= name.name_html(assume_valid: true) %>
77
</h2>
8-
<%= name.formal_html %>
8+
<%= name.formal_html(assume_valid: true) %>
99
</div>
1010
<% name.only_display = true %>
1111
<dl>
@@ -24,7 +24,7 @@
2424
<% if name.type_is_name? %>
2525
<%= name.type_name.rank.capitalize %>
2626
<% if @register&.names&.include?(name.type_name) %>
27-
<%= name.type_name.name_html(nil, true) %>
27+
<%= name.type_name.name_html(assume_valid: true) %>
2828
<% else %>
2929
<%= name.type_name.name_html %>
3030
<% end %>

app/views/registers/table.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<tr>
2727
<td>
2828
<%= name.inferred_rank.capitalize %>
29-
<%= name.name_html(nil, true) %>
29+
<%= name.name_html(assume_valid: true) %>
3030
</td>
3131
<td>
3232
<% if name.syllabication? %>
@@ -42,15 +42,15 @@
4242
<% elsif !name.parent %>
4343
<u>Unknown</u>
4444
<% elsif @register.names.include? name %>
45-
<%= name.parent.name_html(nil, true) %>
45+
<%= name.parent.name_html(assume_valid: true) %>
4646
<% else %>
4747
<%= name.parent.name_html %>
4848
<% end %>
4949
</td>
5050
<td>
5151
<% if name.type_is_name? %>
5252
<% if @register.names.include? name.type_name %>
53-
<%= name.type_name.name_html(nil, true) %>
53+
<%= name.type_name.name_html(assume_valid: true) %>
5454
<% else %>
5555
<%= name.type_name.name_html %>
5656
<% end %>

0 commit comments

Comments
 (0)