From c6d23e4742a1fe9803507973a1d3bb596cf9d799 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 21 Jan 2025 14:19:23 +0100 Subject: [PATCH 1/3] Do not double assign attributes Doing this messed with PictureUploader file names. --- app/controllers/admin/conferences_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/conferences_controller.rb b/app/controllers/admin/conferences_controller.rb index 69ee19a3..cafc2b32 100644 --- a/app/controllers/admin/conferences_controller.rb +++ b/app/controllers/admin/conferences_controller.rb @@ -90,7 +90,7 @@ module Admin @conference.assign_attributes(conference_params) send_mail_on_conf_update = @conference.notify_on_dates_changed? - if @conference.update(conference_params) + if @conference.save ConferenceDateUpdateMailJob.perform_later(@conference) if send_mail_on_conf_update redirect_to edit_admin_conference_path(id: @conference.short_title), notice: 'Conference was successfully updated.' From 9ca7421dafc3d3d726b48fb861e3aa0e29b81f4c Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 21 Jan 2025 16:48:35 +0100 Subject: [PATCH 2/3] Log example name in test.log for easier debugging --- spec/spec_helper.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 71065740..a2a821d6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -122,6 +122,12 @@ RSpec.configure do |config| @request.host = Rails.application.routes.default_url_options[:host] end + config.before(:each) do + Rails.logger.debug '======================================================================' + Rails.logger.debug { "\n\n\n\t\t#{RSpec.current_example.metadata[:full_description]}\n\n\n" } + Rails.logger.debug '======================================================================' + end + # use the config to use # t('some.locale.key') instead of always having to type I18n.t config.include AbstractController::Translation From ddff97147fa62d3ea67761f3094dc1ee5ce76bcc Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 21 Jan 2025 17:30:17 +0100 Subject: [PATCH 3/3] Query versions of associations Not association related versions data. To make this database save, this broke with Postgre. Probably LIKE vs ILIKE... --- app/controllers/admin/events_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index 130558b5..27b19112 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -45,10 +45,8 @@ module Admin @votes = @event.votes.includes(:user) @difficulty_levels = @program.difficulty_levels @versions = @event.versions | - PaperTrail::Version.where(item_type: 'Commercial').where('object LIKE ?', "%commercialable_id: #{@event.id}\ncommercialable_type: Event%") | - PaperTrail::Version.where(item_type: 'Commercial').where('object_changes LIKE ?', "%commercialable_id:\n- \n- #{@event.id}\ncommercialable_type:\n- \n- Event%") | - PaperTrail::Version.where(item_type: 'Vote').where('object_changes LIKE ?', "%\nevent_id:\n- \n- #{@event.id}\n%") | - PaperTrail::Version.where(item_type: 'Vote').where('object LIKE ?', "%\nevent_id: #{@event.id}\n%") + @event.commercials.map(&:versions).flatten | + @event.votes.map(&:versions).flatten end def edit