diff options
| author | Luc Donnet | 2014-10-31 15:47:24 +0100 |
|---|---|---|
| committer | Luc Donnet | 2014-10-31 15:47:24 +0100 |
| commit | c9fd03422743d3d716bbd7199184c035c1b0d4c9 (patch) | |
| tree | 291c67ac01b05b91d9c998edbfdf0528f3ed45be /app/views/devise | |
| parent | 85d72f54aaba1f1eca474abbf3923a9528a68625 (diff) | |
| download | chouette-core-c9fd03422743d3d716bbd7199184c035c1b0d4c9.tar.bz2 | |
Fix devise flash message when signin and refuse user creation if Rails config not accepts Refs #0029417
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/_links.erb | 2 | ||||
| -rw-r--r-- | app/views/devise/registrations/new.html.erb | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/devise/_links.erb b/app/views/devise/_links.erb index 3381b2e8e..e2a1bf3ef 100644 --- a/app/views/devise/_links.erb +++ b/app/views/devise/_links.erb @@ -7,7 +7,7 @@ </li> <li> - <%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%- if devise_mapping.registerable? && controller_name != 'registrations' && Rails.application.config.accept_user_creation %> <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br /> <% end -%> </li> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index d18db9402..79edcb53b 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,10 +1,13 @@ <%= title_tag t('.title') %> <%= semantic_form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |form| %> - <%= form.inputs do %> + <%= form.inputs do %> + <%= form.semantic_fields_for :organisation, Organisation.new do |organisation| %> + <%= organisation.input :name, :label => t("helpers.label.user.organisation_name") %> + <% end %> <% if resource.respond_to?( :name) %> <%= form.input :name %> - <% end %> + <% end %> <%= form.input :email %> <%= form.input :password, :as => :password %> <%= form.input :password_confirmation, :as => :password %> |