From cda316a9c6af02fcd58d41e2ea28760e56331619 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Wed, 15 Apr 2020 13:34:54 +1000 Subject: [PATCH] Dont use updater in action --- lib/custom_wizard/action.rb | 10 +++------- lib/custom_wizard/builder.rb | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/custom_wizard/action.rb b/lib/custom_wizard/action.rb index c0461cf2..2dcc86a3 100644 --- a/lib/custom_wizard/action.rb +++ b/lib/custom_wizard/action.rb @@ -2,7 +2,6 @@ class CustomWizard::Action attr_accessor :data, :action, :user, - :updater, :result def initialize(params) @@ -10,7 +9,6 @@ class CustomWizard::Action @action = params[:action] @user = params[:user] @data = params[:data] - @updater = params[:updater] @log = [] end @@ -47,7 +45,6 @@ class CustomWizard::Action if creator.errors.present? messages = creator.errors.full_messages.join(" ") log_error("failed to create", messages) - updater.errors.add(:create_topic, messages) elsif action['skip_redirect'].blank? data['redirect_on_complete'] = post.topic.url end @@ -85,7 +82,6 @@ class CustomWizard::Action if creator.errors.present? messages = creator.errors.full_messages.join(" ") log_error("failed to create message", messages) - updater.errors.add(:send_message, messages) elsif action['skip_redirect'].blank? data['redirect_on_complete'] = post.topic.url end @@ -123,7 +119,7 @@ class CustomWizard::Action end if result - log_success("updated profile fields", "fields: #{params.keys.map{ |p| p.to_s }.join(',')}") + log_success("updated profile fields", "fields: #{params.keys.map(&:to_s).join(',')}") else log_error("failed to update profile fields", "result: #{result.inspect}") end @@ -148,9 +144,9 @@ class CustomWizard::Action if error = result['error'] || (result[0] && result[0]['error']) error = error['message'] || error - updater.errors.add(:send_to_api, error) + log_error("api request failed", "message: #{error}") else - ## add validation callback + log_success("api request succeeded", "result: #{result}") end end diff --git a/lib/custom_wizard/builder.rb b/lib/custom_wizard/builder.rb index fb29ff03..f1a35bc8 100644 --- a/lib/custom_wizard/builder.rb +++ b/lib/custom_wizard/builder.rb @@ -160,8 +160,7 @@ class CustomWizard::Builder wizard: @wizard, action: action, user: user, - data: data, - updater: updater + data: data ).perform end end