From 584fbe25d17311b2bc922b357393473802f498cf Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Wed, 31 Jul 2013 09:09:09 -0500
Subject: [PATCH] * VRFS-466 - email invtation cleanup 2/3 done

---
 app/views/users/new.html.erb | 22 ----------------------
 lib/managers/user_manager.rb |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)

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