Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix error with user sign up

This commit is contained in:
Alexander Machehin 2015-04-15 15:52:13 +05:00
parent 5a4d9f9369
commit 477a0761d7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/devise/shared/_links.haml
View File

@ -2,7 +2,7 @@
= link_to t("layout.devise.shared_links.sign_in"), new_session_path(resource_name), class: "text_button_padding link_button" = link_to t("layout.devise.shared_links.sign_in"), new_session_path(resource_name), class: "text_button_padding link_button"
- if devise_mapping.registerable? && controller_name != 'registrations' - if devise_mapping.registerable? && controller_name != 'registrations'
=# link_to t("layout.devise.shared_links.sign_up"), new_registration_path(resource_name), class: "text_button_padding link_button" =# link_to t("layout.devise.shared_links.sign_up"), new_registration_path(resource_name), class: "text_button_padding link_button"
= link_to t("layout.devise.shared_links.sign_up"), new_register_request_path, class: "text_button_padding link_button" # to prereg form = link_to t("layout.devise.shared_links.sign_up"), new_user_registration_path, class: "text_button_padding link_button" # to prereg form
- if devise_mapping.recoverable? && controller_name != 'passwords' - if devise_mapping.recoverable? && controller_name != 'passwords'
= link_to t("layout.devise.shared_links.forgot_password"), new_password_path(resource_name), class: "text_button_padding link_button" = link_to t("layout.devise.shared_links.forgot_password"), new_password_path(resource_name), class: "text_button_padding link_button"
- if devise_mapping.confirmable? && controller_name != 'confirmations' - if devise_mapping.confirmable? && controller_name != 'confirmations'

2
app/views/layouts/menu/_new_top.html.slim
View File

@ -50,7 +50,7 @@ nav.navbar.navbar-inverse.top_menu role = "navigation"
li= link_to t('layout.logout'), destroy_user_session_path, method: :delete li= link_to t('layout.logout'), destroy_user_session_path, method: :delete
- else - else
ul.nav.navbar-nav ul.nav.navbar-nav
li= link_to t('layout.devise.shared_links.sign_up'), new_register_request_path li= link_to t('layout.devise.shared_links.sign_up'), new_user_registration_path
li= link_to t('layout.devise.shared_links.sign_in'), new_user_session_path li= link_to t('layout.devise.shared_links.sign_in'), new_user_session_path
/ /.navbar-collapse / /.navbar-collapse
/ /.container-fluid / /.container-fluid

2
config/routes.rb
View File

@ -253,7 +253,7 @@ Rosa::Application.routes.draw do
put :reset_auth_token put :reset_auth_token
end end
end end
resources :register_requests, only: [:new, :create], format: /ru|en/ #view support only two languages #resources :register_requests, only: [:new, :create], format: /ru|en/ #view support only two languages
get '/allowed' => 'users#allowed' get '/allowed' => 'users#allowed'
get '/check' => 'users#check' get '/check' => 'users#check'