diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index cfcbbd31..a461f432 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -34,6 +34,18 @@ <%= render Actions::ActionsComponent.new(resource: @issue, user: current_user) %> +<%= render SectionComponent.new do %> +

Other issues:

+
+ <% @comic.ordered_issues.each do |issue| %> + <% classes = (@issue == issue) ? "font-bold" : "font-light" %> + + #<%= issue.formatted_issue_number %> + + <% end %> +
+<% end %> + <%= render SectionComponent.new do %> <%= render BorderComponent.new do %> <% if @issue.deck.present? %> @@ -55,15 +67,3 @@ <% end %> <% end %> - -<%= render SectionComponent.new do %> -

Other issues:

-
- <% @comic.ordered_issues.each do |issue| %> - <% classes = (@issue == issue) ? "font-bold" : "font-light" %> - - #<%= issue.formatted_issue_number %> - - <% end %> -
-<% end %> diff --git a/app/views/statistics/show.html.erb b/app/views/statistics/show.html.erb index 1b101a34..6ef07841 100644 --- a/app/views/statistics/show.html.erb +++ b/app/views/statistics/show.html.erb @@ -3,8 +3,8 @@ <% if @year != Statistics::BaseCount::ALLTIME %> <%= render SectionComponent.new do %>
- <%= render LinkComponent.new(text: "< #{@year.to_i - 1}", href: user_statistic_path(@year.to_i - 1, user_id: @user)) %> - <%= render LinkComponent.new(text: "#{@year.to_i + 1} >", href: user_statistic_path(@year.to_i + 1, user_id: @user)) %> + <%= render LinkComponent.new(text: "« #{@year.to_i - 1}", href: user_statistic_path(@year.to_i - 1, user_id: @user)) %> + <%= render LinkComponent.new(text: "#{@year.to_i + 1} »", href: user_statistic_path(@year.to_i + 1, user_id: @user)) %>
<% end %> <% end %> diff --git a/config/environments/production.rb b/config/environments/production.rb index da51075c..1b3a3318 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -35,7 +35,7 @@ # Log to STDOUT with the current request id as a default log tag. config.log_tags = [:request_id] - config.logger = ActiveSupport::TaggedLogging.logger(STDOUT) + config.logger = ActiveSupport::TaggedLogging.logger($stdout) # Change to "debug" to log everything (including potentially personally-identifiable information!) config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info") diff --git a/db/migrate/20241231185809_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20241231185809_add_service_name_to_active_storage_blobs.active_storage.rb index a15c6ce8..0267f128 100644 --- a/db/migrate/20241231185809_add_service_name_to_active_storage_blobs.active_storage.rb +++ b/db/migrate/20241231185809_add_service_name_to_active_storage_blobs.active_storage.rb @@ -6,7 +6,7 @@ def up unless column_exists?(:active_storage_blobs, :service_name) add_column :active_storage_blobs, :service_name, :string - if configured_service = ActiveStorage::Blob.service.name + if (configured_service = ActiveStorage::Blob.service.name) ActiveStorage::Blob.unscoped.update_all(service_name: configured_service) end diff --git a/db/migrate/20241231185810_create_active_storage_variant_records.active_storage.rb b/db/migrate/20241231185810_create_active_storage_variant_records.active_storage.rb index 94ac83af..95fd27fa 100644 --- a/db/migrate/20241231185810_create_active_storage_variant_records.active_storage.rb +++ b/db/migrate/20241231185810_create_active_storage_variant_records.active_storage.rb @@ -8,20 +8,21 @@ def change t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type t.string :variation_digest, null: false - t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true + t.index %i[blob_id variation_digest], name: "index_active_storage_variant_records_uniqueness", unique: true t.foreign_key :active_storage_blobs, column: :blob_id end end private - def primary_key_type - config = Rails.configuration.generators - config.options[config.orm][:primary_key_type] || :primary_key - end - def blobs_primary_key_type - pkey_name = connection.primary_key(:active_storage_blobs) - pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name } - pkey_column.bigint? ? :bigint : pkey_column.type - end + def primary_key_type + config = Rails.configuration.generators + config.options[config.orm][:primary_key_type] || :primary_key + end + + def blobs_primary_key_type + pkey_name = connection.primary_key(:active_storage_blobs) + pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name } + pkey_column.bigint? ? :bigint : pkey_column.type + end end diff --git a/spec/requests/statistics_spec.rb b/spec/requests/statistics_spec.rb index 95506914..18f8ffdf 100644 --- a/spec/requests/statistics_spec.rb +++ b/spec/requests/statistics_spec.rb @@ -117,8 +117,8 @@ it "renders links to the next and previous year" do get path - assert_select "a.cursor-pointer", text: "< 2022" - assert_select "a.cursor-pointer", text: "2024 >" + assert_select "a.cursor-pointer", text: "« 2022" + assert_select "a.cursor-pointer", text: "2024 »" end it_behaves_like "a statistics page"