muck-users 3.1.11 → 3.1.12
Sign up to get free protection for your applications and to get access to all the features.
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.1.
|
1
|
+
3.1.12
|
@@ -53,6 +53,8 @@ class Muck::UsersController < ApplicationController
|
|
53
53
|
check_recaptcha
|
54
54
|
success, path = setup_user
|
55
55
|
after_create_response(success, path)
|
56
|
+
rescue MuckUsers::Exceptions::InvalidAccessCode, ActiveRecord::RecordInvalid => ex
|
57
|
+
after_create_response(false)
|
56
58
|
end
|
57
59
|
|
58
60
|
def update
|
@@ -200,7 +202,7 @@ class Muck::UsersController < ApplicationController
|
|
200
202
|
@user.access_code = access_code
|
201
203
|
else
|
202
204
|
flash[:notice] = translate('muck.users.access_required_warning')
|
203
|
-
raise Exceptions::InvalidAccessCode
|
205
|
+
raise MuckUsers::Exceptions::InvalidAccessCode
|
204
206
|
end
|
205
207
|
end
|
206
208
|
end
|
@@ -4,6 +4,7 @@ module MuckUsersHelper
|
|
4
4
|
def signup_form(user, redirect_to = nil, options = {}, &block)
|
5
5
|
options[:html] = {} if options[:html].nil?
|
6
6
|
options[:title] = nil if options[:title].blank?
|
7
|
+
options[:subtitle] = nil if options[:subtitle].blank?
|
7
8
|
raw_block_to_partial('users/signup_form', options.merge(:user => user, :redirect_to => redirect_to), &block)
|
8
9
|
end
|
9
10
|
|
@@ -1,15 +1,22 @@
|
|
1
1
|
<div id="registration" class="common-form">
|
2
2
|
<h1><%= title || t('muck.users.register_account', :application_name => MuckEngine.configuration.application_name) %></h1>
|
3
|
-
<p
|
3
|
+
<p>
|
4
|
+
<% if subtitle -%>
|
5
|
+
<%= subtitle.html_safe %>
|
6
|
+
<% else -%>
|
7
|
+
<%= t('muck.users.already_registered') %> <a href="<%=login_url%>"><%= t('muck.users.sign_in_now') %></a>
|
8
|
+
<% end -%>
|
9
|
+
</p>
|
4
10
|
<%= muck_form_for :user, :url => users_path, :html => {:id => "register-user-form", :name => 'register-user-form'} do |f| -%>
|
5
11
|
|
6
12
|
<%= output_errors(t('muck.users.problem_creating_account'), {:class => 'help-box'}, user) %>
|
7
13
|
|
8
14
|
<% if MuckUsers.configuration.require_access_code -%>
|
9
15
|
<%= f.text_field :access_code_code, { :label => translate('muck.users.access_code'),
|
10
|
-
:extra_html =>
|
11
|
-
|
12
|
-
|
16
|
+
:extra_html => '<p id="access_code_help">' +
|
17
|
+
translate('muck.users.access_code_help',
|
18
|
+
:access_request_anchor => %Q{<a class="fancy-access-request iframe" href="#{new_access_code_request_path}">},
|
19
|
+
:access_request_anchor_end => "</a>") + '<p>'.html_safe } -%>
|
13
20
|
<% end -%>
|
14
21
|
|
15
22
|
<%= f.text_field :login, { :label => t('muck.users.choose_member_name'),
|
data/lib/muck-users/engine.rb
CHANGED
data/muck-users.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{muck-users}
|
8
|
-
s.version = "3.1.
|
8
|
+
s.version = "3.1.12"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Justin Ball", "Joel Duffin"]
|
12
|
-
s.date = %q{2011-03-
|
12
|
+
s.date = %q{2011-03-02}
|
13
13
|
s.description = %q{Easily add user signup, login and other features to your application}
|
14
14
|
s.email = %q{justin@tatemae.com}
|
15
15
|
s.extra_rdoc_files = [
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: muck-users
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 27
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 3
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 3.1.
|
9
|
+
- 12
|
10
|
+
version: 3.1.12
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Justin Ball
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2011-03-
|
19
|
+
date: 2011-03-02 00:00:00 -07:00
|
20
20
|
default_executable:
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|