Skip to content

A platform for community discussion. Free, open, simple.

Fix rubocop errors in ERB (#43828)

Joel Hawksley6c261c7c37c1
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 1812aca8367..53e6f7f840b 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -22,7 +22,7 @@
<div itemprop='description'><%= c.description&.html_safe %></div>
<% if c.subcategory_list.present? %>
<div class='subcategories'>
- <% c.subcategory_list.each_with_index do |sc, index| %>
+ <% c.subcategory_list.each do |sc| %>
<a href='<%= sc.url %>'><%= sc.name %></a>&nbsp;
<% end %>
</div>
diff --git a/app/views/qunit/qunit.html.erb b/app/views/qunit/qunit.html.erb
index 1b907e3950a..9bd11bb58f2 100644
--- a/app/views/qunit/qunit.html.erb
+++ b/app/views/qunit/qunit.html.erb
@@ -53,7 +53,7 @@
<link rel="canonical" href="/">
<style>
- <%= File.read("#{Rails.root}/frontend/discourse/node_modules/qunit/qunit/qunit.css").html_safe %>
+ <%= File.read(Rails.root.join("frontend/discourse/node_modules/qunit/qunit/qunit.css")).html_safe %>
#ember-testing * {
-webkit-transition: none !important;
diff --git a/app/views/topics/plain.html.erb b/app/views/topics/plain.html.erb
index 87d8e3c5538..e558debd520 100644
--- a/app/views/topics/plain.html.erb
+++ b/app/views/topics/plain.html.erb
@@ -25,7 +25,7 @@
<% @topic_view.posts.each do |post| %>
<% if post.user %>
<div class='creator'>
- <b><%= post.user.username %></b> <%= "(#{post.user.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names?) %> at <%= post.created_at.to_formatted_s(:long_ordinal) %> — #<%= post.post_number %>
+ <b><%= post.user.username %></b> <%= "(#{post.user.name})" if SiteSetting.display_name_on_posts && SiteSetting.enable_names? %> at <%= post.created_at.to_formatted_s(:long_ordinal) %> — #<%= post.post_number %>
</div>
<div class='post'>
<% if post.hidden %>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 5c0d4c3fe5f..649592e50a0 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -80,7 +80,7 @@
<% if emit_md %>
<meta itemprop='url' content='<%= Discourse.base_url %>/u/<%= u.username %>'>
<% end %>
- <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>
+ <%= "(#{u.name})" if SiteSetting.display_name_on_posts && SiteSetting.enable_names? && u.name.present? %>
<%
post_custom_fields = @topic_view.post_custom_fields[post.id] || {}
who_username = post_custom_fields["action_code_who"] || ""
diff --git a/app/views/users/confirm_admin.html.erb b/app/views/users/confirm_admin.html.erb
index e9a1dbbea14..96d9daba8b3 100644
--- a/app/views/users/confirm_admin.html.erb
+++ b/app/views/users/confirm_admin.html.erb
@@ -2,19 +2,19 @@
<h2><%= t 'activation.admin_confirm.title' %></h2>
<br/>
- <%- unless @confirmed %>
- <%=raw (t('activation.admin_confirm.description', target_email: @confirmation.target_user.email, target_username: @confirmation.target_user.username)) %>
+ <%- if @confirmed %>
+ <%=raw t('activation.admin_confirm.complete', target_username: @confirmation.target_user.username) %>
+ <br/>
+ <br/>
+ <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), Discourse.base_url, class: 'btn btn-primary' %>
+ <% else %>
+ <%=raw t('activation.admin_confirm.description', target_email: @confirmation.target_user.email, target_username: @confirmation.target_user.username) %>
<br/>
<br/>
<%= form_tag do %>
<%= submit_tag t('activation.admin_confirm.grant'), class: 'btn btn-primary' %>
<% end %>
- <% else %>
- <%=raw (t('activation.admin_confirm.complete', target_username: @confirmation.target_user.username)) %>
- <br/>
- <br/>
- <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), Discourse.base_url, class: 'btn btn-primary' %>
<% end %>
</div>
diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb
index 3b2c52afa1f..3105bf3a452 100644
--- a/app/views/users/password_reset.html.erb
+++ b/app/views/users/password_reset.html.erb
@@ -7,7 +7,7 @@
<div class="error-info">
<%= @error.html_safe %>
- <% if @user.present? and @user.errors.present? %>
+ <% if @user.present? && @user.errors.present? %>
<% @user.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
<% end %>