app/controllers/registrations_controller.rb in milia-0.3.15 vs app/controllers/registrations_controller.rb in milia-0.3.16
- old
+ new
@@ -2,11 +2,15 @@
class RegistrationsController < Devise::RegistrationsController
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
-
+# TODO: options if using recaptcha
+# TODO: options if non-standard path for new signups view
+# TODO: options if background task for tenant creation
+# TODO: options if
+# TODO: options if
# ------------------------------------------------------------------------------
# create -- intercept the POST create action upon new sign-up
# new tenant account is vetted, then created, then proceed with devise create user
# CALLBACK: Tenant.create_new_tenant -- prior to completing user account
# CALLBACK: Tenant.tenant_signup -- after completing user account
@@ -21,22 +25,25 @@
if @tenant.errors.empty? # tenant created
initiate_tenant( @tenant ) # first time stuff for new tenant
super # devise resource(user) creation; sets resource
- # w/o background task: Tenant.tenant_signup(resource, @tenant,params[:coupon])
-
- StartupJob.queue_startup(@tenant, resource, params[:coupon])
-
+ if resource.errors.empty?
+ # w/o background task: Tenant.tenant_signup(resource, @tenant,params[:coupon])
+ StartupJob.queue_startup(@tenant, resource, params[:coupon])
+ else
+ @tenant.destroy # remove the newly created tenant item before retrying
+ end
+
else
@user = User.new(params[:user])
- render :action => 'new'
+ render 'home/new'
end
# else
# flash[:error] = "Recaptcha code error; please re-enter the code and click submit again"
# @user = User.new(params[:user])
- # render :action => 'new'
+ # render 'home/new'
# end
end # def create
# ------------------------------------------------------------------------------