mirror of
https://github.com/tildeverse/lobsters
synced 2024-06-24 17:27:04 +00:00
move after-signup invite page into signup controller
This commit is contained in:
parent
d95618f08b
commit
1c0a8dfd03
|
@ -1,4 +1,6 @@
|
|||
class SignupController < ApplicationController
|
||||
before_filter :require_logged_in_user, :only => :invite
|
||||
|
||||
def index
|
||||
if @user
|
||||
flash[:error] = "You are already signed up."
|
||||
|
@ -45,7 +47,7 @@ class SignupController < ApplicationController
|
|||
|
||||
Countinual.count!("lobsters.users.created", "+1")
|
||||
|
||||
return redirect_to "/users/invite"
|
||||
return redirect_to "/signup/invite"
|
||||
else
|
||||
render :action => "invited"
|
||||
end
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
class UsersController < ApplicationController
|
||||
before_filter :require_logged_in_user, :only => :invite
|
||||
|
||||
def show
|
||||
@showing_user = User.find_by_username!(params[:id])
|
||||
@title = "User #{@showing_user.username}"
|
||||
|
|
|
@ -4,10 +4,9 @@
|
|||
</div>
|
||||
|
||||
<p>
|
||||
This community can only grow when members invite new users, just as <a
|
||||
href="/u/<%= @user.invited_by_user.try(:username) %>"><%=
|
||||
@user.invited_by_user.try(:username) %></a> invited you. Take a moment and
|
||||
invite someone you know.
|
||||
This community can only grow when members invite new users, just as
|
||||
<strong><%= @user.invited_by_user.try(:username) %></strong> invited you.
|
||||
Take a moment and invite someone you know.
|
||||
</p>
|
||||
|
||||
<%= render :partial => "users/invitationform",
|
|
@ -21,6 +21,7 @@ Lobsters::Application.routes.draw do
|
|||
|
||||
get "/signup" => "signup#index"
|
||||
post "/signup" => "signup#signup"
|
||||
get "/signup/invite" => "signup#invite"
|
||||
|
||||
match "/login/forgot_password" => "login#forgot_password",
|
||||
:as => "forgot_password"
|
||||
|
@ -69,8 +70,6 @@ Lobsters::Application.routes.draw do
|
|||
get "/u" => "users#tree"
|
||||
get "/u/:id" => "users#show"
|
||||
|
||||
get "/users/invite" => "users#invite"
|
||||
|
||||
get "/settings" => "settings#index"
|
||||
post "/settings" => "settings#update"
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user