* VRFS-466 - email invtation cleanup 2/3 done

This commit is contained in:
Seth Call 2013-07-31 09:09:09 -05:00
parent 3b0a553aba
commit 584fbe25d1
2 changed files with 2 additions and 24 deletions

View File

@ -12,28 +12,6 @@
<br />
<div class="signin-overlay register-page">
<!-- ftue header -->
<% unless @invited_user.nil? %>
<% if @invited_user.sender.nil? %>
<div class="content-head">
<h1>you've been invited to join jamkazam</h1>
</div>
<div class="ftue-invited">
Signup and you can starting jamming, too.
</div>
<% else %>
<div class="content-head">
<h1>you've been invited by <%= @invited_user.sender_display_name %> to join jamkazam</h1>
</div>
<div class="ftue-invited">
Signup and you can starting jamming, too.
</div>
<% end %>
<% end %>
<div class="content-head">
<h1>create a jamkazam account</h1>
</div>

View File

@ -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