jro_apps/redmine Commit - r9757:986ffb243438

Use named routes....

Jean-Philippe Lang -

r9757:986ffb243438

parent child

Context file:

r9757:986ffb243438

Collapse all files

app/controllers/account_controller.rb +5 -5

                      if token.save
                        Mailer.lost_password(token).deliver
                        flash[:notice] = l(:notice_account_lost_email_sent)
-                       redirect_to :action => 'login'
+                       redirect_to signin_path
                        return
                      end
                    end
                    token.destroy
                    flash[:notice] = l(:notice_account_activated)
                  end
-                 redirect_to :action => 'login'
+                 redirect_to signin_path
                end
                private
                def onthefly_creation_failed(user, auth_source_options = { })
                  @user = user
                  session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
-                 render :action => 'register'
+                 render register_path
                end
                def invalid_credentials
                  if user.save and token.save
                    Mailer.register(token).deliver
                    flash[:notice] = l(:notice_account_register_done)
-                   redirect_to :action => 'login'
+                   redirect_to signin_path
                  else
                    yield if block_given?
                  end
                def account_pending
                  flash[:notice] = l(:notice_account_pending)
-                 redirect_to :action => 'login'
+                 redirect_to signin_path
                end
              end

app/views/account/login.html.erb +2 -2

              <%= call_hook :view_account_login_top %>
              <div id="login-form">
-             <%= form_tag({:action=> "login"}) do %>
+             <%= form_tag(signin_path) do %>
              <%= back_url_hidden_field_tag %>
              <table>
              <tr>
              <tr>
                  <td align="left">
                      <% if Setting.lost_password? %>
-                         <%= link_to l(:label_password_lost), :controller => 'account', :action => 'lost_password' %>
+                         <%= link_to l(:label_password_lost), lost_password_path %>
                      <% end %>
                  </td>
                  <td align="right">

app/views/account/lost_password.html.erb +8 -8

		@@ -1,11 +1,11
1	1	<h2><%=l(:label_password_lost)%></h2>
2	2
3		<div class="box">
4		<%= form_tag({:action=> "lost_password"}, :class => "tabular") do %>
5
6		~~<p>~~<label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
7		<%= text_field_tag 'mail', nil, :size => 40 %>
8		<%= submit_tag l(:button_submit) %>~~</p>~~
9
	3	<%= form_tag(lost_password_path) do %>
	4	<div class="box tabular">
	5	<p>
	6	<label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
	7	<%= text_field_tag 'mail', nil, :size => 40 %>
	8	<%= submit_tag l(:button_submit) %>
	9	</p>
	10	</div>
10	11	<% end %>
11		</div>

app/views/account/register.html.erb +1 -1

              <h2><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h2>
-             <%= labelled_form_for @user, :url => {:action => 'register'} do |f| %>
+             <%= labelled_form_for @user, :url => register_path do |f| %>
              <%= error_messages_for 'user' %>
              <div class="box tabular">

config/routes.rb +2 -2

                match 'login', :to => 'account#login', :as => 'signin'
                match 'logout', :to => 'account#logout', :as => 'signout'
-               match 'account/register', :to => 'account#register', :via => [:get, :post]
-               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post]
+               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
+               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
                match 'account/activate', :to => 'account#activate', :via => :get
                match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news'

lib/redmine.rb +1 -1

              Redmine::MenuManager.map :account_menu do |menu|
                menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
-               menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
+               menu.push :register, :register_path, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
                menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
                menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages