From c7baf0b6abe4f7ac9b174b597f00b6a51c60214f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 13 Apr 2012 16:13:00 +0200 Subject: [PATCH] Fixed getting started, only relogin first/master agent. --- .../app/controllers/getting_started.js.coffee | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/app/assets/javascripts/app/controllers/getting_started.js.coffee b/app/assets/javascripts/app/controllers/getting_started.js.coffee index 00d4578f7..484d6a495 100644 --- a/app/assets/javascripts/app/controllers/getting_started.js.coffee +++ b/app/assets/javascripts/app/controllers/getting_started.js.coffee @@ -4,7 +4,7 @@ class Index extends App.Controller className: 'container getstarted' events: - 'submit form': 'submit', + 'submit form': 'submit', 'click .submit': 'submit', constructor: -> @@ -87,43 +87,45 @@ class Index extends App.Controller # save user user.save( success: (r) => - # send email - - # clear form - auth = new App.Auth - auth.login( - data: { - username: @params.login, - password: @params.password, - }, - success: @success -# error: @error, - ) + + if @master_user + @master_user = false + auth = new App.Auth + auth.login( + data: { + username: @params.login, + password: @params.password, + }, + success: @relogin +# error: @error, + ) + else + + # rerender page + @render() + # error: => # @modalHide() ) - success: (data, status, xhr) => + relogin: (data, status, xhr) => @log 'login:success', data - if @master_user - - # login check - auth = new App.Auth - auth.loginCheck() + # login check + auth = new App.Auth + auth.loginCheck() - # add notify - Spine.trigger 'notify:removeall' + # add notify + Spine.trigger 'notify:removeall' # @notify # type: 'success', # msg: 'Thanks for joining. Email sent to "' + @params.email + '". Please verify your email address.' - @el.find('.master_user').fadeOut('slow', => - @el.find('.agent_user').fadeIn() - ) - # redirect to # -# @navigate '#getting_started' -# @fetch() + @el.find('.master_user').fadeOut('slow', => + @el.find('.agent_user').fadeIn() + ) + + Config.Routes['getting_started'] = Index