1
0
Fork 0

Merge branch 'juless_extensions' of https://github.com/merefield/discourse-custom-wizard into juless_extensions

Dieser Commit ist enthalten in:
Robert Barrow 2019-10-04 22:17:52 +01:00
Commit f1ea4159f5
3 geänderte Dateien mit 5 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -1,4 +1,4 @@
class CustomWizard::StepsController < ApplicationController class CustomWizard::StepsController < ::ApplicationController
before_action :ensure_logged_in before_action :ensure_logged_in
def update def update

Datei anzeigen

@ -90,6 +90,10 @@ end
object.name object.name
end end
def include_name?
object.respond_to?(:name)
end
def background def background
object.background object.background
end end

Datei anzeigen

@ -52,7 +52,6 @@ after_initialize do
put ':wizard_id/steps/:step_id' => 'steps#update' put ':wizard_id/steps/:step_id' => 'steps#update'
end end
require_dependency 'admin_constraint'
Discourse::Application.routes.append do Discourse::Application.routes.append do
mount ::CustomWizard::Engine, at: 'w' mount ::CustomWizard::Engine, at: 'w'
post 'wizard/authorization/callback' => "custom_wizard/authorization#callback" post 'wizard/authorization/callback' => "custom_wizard/authorization#callback"
@ -76,7 +75,6 @@ after_initialize do
delete 'admin/wizards/apis/logs/:name' => 'api#clearlogs' delete 'admin/wizards/apis/logs/:name' => 'api#clearlogs'
get 'admin/wizards/apis/:name/redirect' => 'api#redirect' get 'admin/wizards/apis/:name/redirect' => 'api#redirect'
get 'admin/wizards/apis/:name/authorize' => 'api#authorize' get 'admin/wizards/apis/:name/authorize' => 'api#authorize'
#transfer code
get 'admin/wizards/transfer' => 'transfer#index' get 'admin/wizards/transfer' => 'transfer#index'
get 'admin/wizards/transfer/export' => 'transfer#export' get 'admin/wizards/transfer/export' => 'transfer#export'
post 'admin/wizards/transfer/import' => 'transfer#import' post 'admin/wizards/transfer/import' => 'transfer#import'
@ -140,7 +138,6 @@ after_initialize do
end end
end end
require_dependency 'invites_controller'
class ::InvitesController class ::InvitesController
prepend InvitesControllerCustomWizard prepend InvitesControllerCustomWizard
end end