Merge pull request #699 from elzj/invite_request_access

Invite request access
otwcode · Jun 12, 2012 · 318a53b · 318a53b
2 parents 781810a + 5b688fe
commit 318a53b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/app/controllers/invite_requests_controller.rb b/app/controllers/invite_requests_controller.rb
@@ -10,14 +10,10 @@ def index
   # GET /invite_requests/1
   # GET /invite_requests/1.xml
   def show
-    if params[:email]
-      @invite_request = InviteRequest.find_by_email(params[:email])
-      unless (request.xml_http_request?) || @invite_request
-        setflash; flash[:error] = "Sorry, we couldn't find that address in our queue. If you signed up and you haven't received an invitation, please contact our support team for help."
-        redirect_to invite_requests_url and return
-      end    
-    else
-      @invite_request = InviteRequest.find(params[:id])
+    @invite_request = InviteRequest.find_by_email(params[:email])
+    unless (request.xml_http_request?) || @invite_request
+      setflash; flash[:error] = "Sorry, we couldn't find that address in our queue. If you signed up and you haven't received an invitation, please contact our support team for help."
+      redirect_to invite_requests_url and return
     end
     respond_to do |format|
       format.html
@@ -30,8 +26,8 @@ def show
   def create
     @invite_request = InviteRequest.new(params[:invite_request])
     if @invite_request.save
-      setflash; flash[:notice] = "You've been added to our queue! Yay!"
-      redirect_to @invite_request 
+      setflash; flash[:notice] = "You've been added to our queue! Yay! We estimate that you'll receive an invitation around #{@invite_request.proposed_fill_date}."
+      redirect_to invite_requests_path
     else
       render :action => :index
     end

diff --git a/app/controllers/user_invite_requests_controller.rb b/app/controllers/user_invite_requests_controller.rb
@@ -10,31 +10,35 @@ def index
   # GET /user_invite_requests/new
   # GET /user_invite_requests/new.xml
   def new
-    if logged_in? 
-      @user = current_user
-      @user_invite_request = @user.user_invite_requests.build
-    else
-      setflash; flash[:error] = "Please log in."
-      redirect_to login_path
-    end
+    setflash; flash[:error] = "Sorry, new invitations are not currently available. If you're a challenge mod or are looking to preserve works from another site, please contact Support."
+    redirect_to root_path
+    # if logged_in? 
+    #   @user = current_user
+    #   @user_invite_request = @user.user_invite_requests.build
+    # else
+    #   setflash; flash[:error] = "Please log in."
+    #   redirect_to login_path
+    # end
   end
 
   # POST /user_invite_requests
   # POST /user_invite_requests.xml
   def create
-    if logged_in? 
-      @user = current_user
-      @user_invite_request = @user.user_invite_requests.build(params[:user_invite_request])
-    else
-      setflash; flash[:error] = "Please log in."
-      redirect_to login_path
-    end
-    if @user_invite_request.save
-      setflash; flash[:notice] = 'Request was successfully created.'
-      redirect_to(@user)
-    else
-      render :action => "new"
-    end
+    setflash; flash[:error] = "Sorry, new invitations are not currently available. If you're a challenge mod or are looking to preserve works from another site, please contact Support."
+    redirect_to root_path
+    # if logged_in? 
+    #   @user = current_user
+    #   @user_invite_request = @user.user_invite_requests.build(params[:user_invite_request])
+    # else
+    #   setflash; flash[:error] = "Please log in."
+    #   redirect_to login_path
+    # end
+    # if @user_invite_request.save
+    #   setflash; flash[:notice] = 'Request was successfully created.'
+    #   redirect_to(@user)
+    # else
+    #   render :action => "new"
+    # end
   end
 
   # PUT /user_invite_requests/1