nickslowinski/discourse-custom-wizard-unlocked
1
0
Fork 0
geforkt von mirrored/discourse-custom-wizard
Code Pull-Requests Aktivität

FIX: pass restart_on_revisit as option on initial load

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Angus McLeod 2019-11-15 10:29:48 +11:00
Ursprung acad46b246
Commit c812f60fd7
2 geänderte Dateien mit 2 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
controllers/wizard.rb
Datei anzeigen

@ -22,7 +22,7 @@ class CustomWizard::WizardController < ::ApplicationController
format.json do format.json do
builder = CustomWizard::Builder.new(current_user, params[:wizard_id].underscore) builder = CustomWizard::Builder.new(current_user, params[:wizard_id].underscore)
builder_opts = {} builder_opts = {}
builder_opts[:reset] = params[:reset] if params[:reset] builder_opts[:reset] = params[:reset] || builder.wizard.restart_on_revisit
if builder.wizard.present? if builder.wizard.present?
wizard = builder.build(builder_opts, params) wizard = builder.build(builder_opts, params)

3
lib/builder.rb
Datei anzeigen

@ -78,8 +78,7 @@ class CustomWizard::Builder
def build(build_opts = {}, params = {}) def build(build_opts = {}, params = {})
unless (@wizard.completed? && !@wizard.multiple_submissions && !@wizard.user.admin) || !@steps || !@wizard.permitted? unless (@wizard.completed? && !@wizard.multiple_submissions && !@wizard.user.admin) || !@steps || !@wizard.permitted?
reset_submissions if build_opts[:reset]
reset_submissions if build_opts[:reset] || @wizard.restart_on_revisit
@steps.each do |step_template| @steps.each do |step_template|
@wizard.append_step(step_template['id']) do |step| @wizard.append_step(step_template['id']) do |step|