diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 164dcb67b..4dee1f377 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -12,28 +12,6 @@
- - <% unless @invited_user.nil? %> - <% if @invited_user.sender.nil? %> -
-

you've been invited to join jamkazam

-
- -
- Signup and you can starting jamming, too. -
- - <% else %> -
-

you've been invited by <%= @invited_user.sender_display_name %> to join jamkazam

-
- -
- Signup and you can starting jamming, too. -
-<% end %> - <% end %> -

create a jamkazam account

diff --git a/lib/managers/user_manager.rb b/lib/managers/user_manager.rb index d80d17275..680e48ec1 100644 --- a/lib/managers/user_manager.rb +++ b/lib/managers/user_manager.rb @@ -15,8 +15,8 @@ class UserManager < BaseManager @user = User.new - # check if we have disabled signup for this site. - unless SampleApp::Application.config.signup_enabled + # check if we have disabled open signup for this site. open == invited users can still get in + unless SampleApp::Application.config.signup_enabled && invited_user.nil? raise PermissionError, "Signups are currently disabled" end