muck-users 3.1.16 → 3.1.17

data/VERSION

@@ -1 +1 @@
-3.1.16
+3.1.17

data/app/controllers/muck/access_code_requests_controller.rb

@@ -3,7 +3,7 @@ class Muck::AccessCodeRequestsController < ApplicationController
   layout 'popup'
 
   ssl_required :new, :create
-  before_filter :not_logged_in_required
+  before_filter :not_logged_in_required, :except => [:create]
 
   def show
     render :template => 'access_code_requests/show'
@@ -15,21 +15,33 @@ class Muck::AccessCodeRequestsController < ApplicationController
   end
     
   def create
-    @page_title = t('muck.users.request_access_code')
-    @access_code_request = AccessCodeRequest.create(params[:access_code_request])
-    respond_to do |format|
-      format.js do
-        render :template => 'access_code_requests/create.js', :layout => false
+    if logged_in?
+      @indicate_logged_in = true
+      respond_to do |format|
+        format.js do
+          render :template => 'access_code_requests/create.js', :layout => false
+        end
+        format.html do
+          flash[:notice] = translate('muck.users.beta_code_not_required')
+          redirect_to user_path(current_user)
+        end
       end
-      format.html do
-        if @access_code_request
-          redirect_to access_code_request_path(@access_code_request)
-        else
-          render :template => "access_code_requests/new"
+    else
+      @access_code_request = AccessCodeRequest.create(params[:access_code_request])
+      respond_to do |format|
+        format.js do
+          render :template => 'access_code_requests/create.js', :layout => false
+        end
+        format.html do
+          @page_title = t('muck.users.request_access_code')
+          if @access_code_request
+            redirect_to access_code_request_path(@access_code_request)
+          else
+            render :template => "access_code_requests/new"
+          end
         end
       end
     end
-        
   end
 
 end

data/app/views/access_code_requests/create.js.erb

@@ -1,5 +1,9 @@
-<% if @access_code_request.errors.any? -%>
-	jQuery('.beta_code_request_form').prepend("<%= @access_code_request.errors.full_messages.to_sentence %>");
+<% if @indicate_logged_in -%>
+	jQuery('.beta_code_request_form').prepend("<%= t('muck.users.beta_code_not_required') %>");
 <% else -%>
-	jQuery('.beta_code_request_form').html("<%= t('muck.users.access_code_thank_you') %>");
-<% end -%>
+	<% if @access_code_request.errors.any? -%>
+		jQuery('.beta_code_request_form').prepend("<%= @access_code_request.errors.full_messages.to_sentence %>");
+	<% else -%>
+		jQuery('.beta_code_request_form').html("<%= t('muck.users.access_code_thank_you') %>");
+	<% end -%>
+<% end %>

data/config/locales/en.yml

@@ -77,8 +77,8 @@ en:
       problem_editing_account: There was a problem updating your information.
       edit: Edit
       access_code_subject: Subject
-      bulk_access_codes_or: OR
       thanks_sign_up: Thanks for signing up!
+      bulk_access_codes_or: OR
       access_code_request_send_problem: There was a problem sending the code
       sign_in: Sign In
       user_enabled: User enabled
@@ -94,6 +94,7 @@ en:
       select_new_password: Select a New Password
       login: Login
       access_code_requests_code_sent_on: Code Sent on
+      send_access_codes: Send Codes
       access_code_help: If you received a access code from us, please enter it in the box above. You may also %{access_request_anchor}request a access code%{access_request_anchor_end}.
       email_address: Email Address
       delete: Delete
@@ -183,7 +184,6 @@ en:
       join_application_name: Join and get it done
       bulk_access_code_tip: Optional. If a code is specified then that code will be sent to all users.  Leave this field empty to send a unique code to each user.
       bulk_access_code_emails_tip: Separate emails with a comma
-      send_access_codes: Send Codes
       password_updated: Password successfully updated.
       register_for_account: Register for an account
       recover_password_prompt: (If you forgot your password recover it here)
@@ -222,6 +222,7 @@ en:
       expiration_date: Expiration Date
       add: Add
       terms_of_service_required: You must accept the terms of service.
+      beta_code_not_required: You are already logged in and so you probably don't really want a beta code.
       password: Password
       access_request_email: Email
       current_password: Current Password

data/muck-users.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.16"
+  s.version = "3.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 3
   - 1
-  - 16
-  version: 3.1.16
+  - 17
+  version: 3.1.17
 platform: ruby
 authors: 
 - Justin Ball