1
0
Fork 0

FIX: extension module prepending

Dieser Commit ist enthalten in:
Angus McLeod 2019-12-12 10:53:13 +11:00
Ursprung 6ad44d58ad
Commit e584123d34
5 geänderte Dateien mit 42 neuen und 33 gelöschten Zeilen

Datei anzeigen

@ -1,8 +1,10 @@
module ApplicationControllerCWExtension
module CustomWizardApplicationControllerExtension
extend ActiveSupport::Concern
included do
before_action :redirect_to_wizard_if_required, if: :current_user
def self.prepended(klass)
klass.class_eval do
before_action :redirect_to_wizard_if_required, if: :current_user
end
end
def redirect_to_wizard_if_required
@ -23,5 +25,5 @@ module ApplicationControllerCWExtension
end
class ApplicationController
prepend ApplicationControllerCWExtension if SiteSetting.custom_wizard_enabled
prepend CustomWizardApplicationControllerExtension if SiteSetting.custom_wizard_enabled
end

Datei anzeigen

@ -1,11 +1,12 @@
## TODO limit this to the first admin
module SiteSerializerCWX
module CustomWizardSiteSerializerExtension
extend ActiveSupport::Concern
included do
attributes :complete_custom_wizard
def self.prepended(klass)
klass.class_eval do
attributes :complete_custom_wizard
end
end
def include_wizard_required?
scope.is_admin? && Wizard.new(scope.user).requires_completion?
@ -23,5 +24,5 @@ module SiteSerializerCWX
end
class SiteSerializer
prepend SiteSerializerCWX if SiteSetting.custom_wizard_enabled
prepend CustomWizardSiteSerializerExtension if SiteSetting.custom_wizard_enabled
end

Datei anzeigen

@ -1,8 +1,10 @@
module CustomWizardWizardFieldSerializerExtension
module CustomWizardFieldSerializerExtension
extend ActiveSupport::Concern
included do
attributes :dropdown_none, :image, :file_types, :limit, :property
def self.prepended(klass)
klass.class_eval do
attributes :dropdown_none, :image, :file_types, :limit, :property
end
end
def label
@ -45,5 +47,5 @@ module CustomWizardWizardFieldSerializerExtension
end
class WizardFieldSerializer
prepend CustomWizardWizardFieldSerializerExtension if SiteSetting.custom_wizard_enabled
prepend CustomWizardFieldSerializerExtension if SiteSetting.custom_wizard_enabled
end

Datei anzeigen

@ -1,19 +1,21 @@
module CustomWizardWizardSerializerExtension
module CustomWizardSerializerExtension
extend ActiveSupport::Concern
included do
attributes :id,
:name,
:background,
:completed,
:required,
:min_trust,
:permitted,
:user,
:categories,
:uncategorized_category_id
def self.prepended(klass)
klass.class_eval do
attributes :id,
:name,
:background,
:completed,
:required,
:min_trust,
:permitted,
:user,
:categories,
:uncategorized_category_id
end
end
def id
object.id
end
@ -89,7 +91,7 @@ module CustomWizardWizardSerializerExtension
site = ::Site.new(scope)
::ActiveModel::ArraySerializer.new(site.categories, each_serializer: BasicCategorySerializer)
rescue => e
puts "HERE IS THE ERROR: #{e.inspect}"
[]
end
end
@ -98,6 +100,6 @@ module CustomWizardWizardSerializerExtension
end
end
class WizardSerializer
prepend CustomWizardWizardSerializerExtension if SiteSetting.custom_wizard_enabled
class WizardSerializer
prepend CustomWizardSerializerExtension if SiteSetting.custom_wizard_enabled
end

Datei anzeigen

@ -1,8 +1,10 @@
module CustomWizardWizardStepSerializerExtension
module CustomWizardStepSerializerExtension
extend ActiveSupport::Concern
included do
attributes :permitted, :permitted_message
def self.prepended(klass)
klass.class_eval do
attributes :permitted, :permitted_message
end
end
def title
@ -25,5 +27,5 @@ module CustomWizardWizardStepSerializerExtension
end
class WizardStepSerializer
prepend CustomWizardWizardStepSerializerExtension if SiteSetting.custom_wizard_enabled
prepend CustomWizardStepSerializerExtension if SiteSetting.custom_wizard_enabled
end