jro_apps/redmine Commit - r172:4e03668eec2c

* replaced :controller => '' broken statements by :controller => 'welcome'...

Jean-Philippe Lang -

r172:4e03668eec2c

parent child

Context file:

r172:4e03668eec2c

Collapse all files

app/controllers/account_controller.rb +6 -6

               # Log out current user and redirect to welcome page
               def logout
                 self.logged_in_user = nil
-                redirect_to :controller => ''
+                redirect_to :controller => 'welcome'
               end
               # Enable user to choose a new password
               def lost_password
                 if params[:token]
                   @token = Token.find_by_action_and_value("recovery", params[:token])
-                  redirect_to :controller => '' and return unless @token and !@token.expired?
+                  redirect_to :controller => 'welcome' and return unless @token and !@token.expired?
                   @user = @token.user
                   if request.post?
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
               # User self-registration
               def register
-                redirect_to :controller => '' and return unless Setting.self_registration?
+                redirect_to :controller => 'welcome' and return unless Setting.self_registration?
                 if params[:token]
                   token = Token.find_by_action_and_value("register", params[:token])
-                  redirect_to :controller => '' and return unless token and !token.expired?
+                  redirect_to :controller => 'welcome' and return unless token and !token.expired?
                   user = token.user
-                  redirect_to :controller => '' and return unless user.status == User::STATUS_REGISTERED
+                  redirect_to :controller => 'welcome' and return unless user.status == User::STATUS_REGISTERED
                   user.status = User::STATUS_ACTIVE
                   if user.save
                     token.destroy
                       Mailer.set_language_if_valid(@user.language)
                       Mailer.deliver_register(token)
                       flash[:notice] = l(:notice_account_register_done)
-                      redirect_to :controller => ''
+                      redirect_to :controller => 'welcome' and return
                     end
                   end
                 end

app/controllers/application.rb +4 -4

               # store current uri in session.
               # return to this location by calling redirect_back_or_default
               def store_location
-                session[:return_to] = request.request_uri
+                session[:return_to_params] = params
               end
               # move to the last store_location call or to the passed default one
               def redirect_back_or_default(default)
-                if session[:return_to].nil?
+                if session[:return_to_params].nil?
                   redirect_to default
                 else
-                  redirect_to_url session[:return_to]
+                  redirect_to session[:return_to_params]
-                  session[:return_to] = nil
+                  session[:return_to_params] = nil
                 end
               end

app/views/feeds/news.rxml +1 -1

             xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
               xml.channel do
                 xml.title "#{Setting.app_title}: #{l(:label_news_latest)}"
-                xml.link url_for(:controller => '', :only_path => false)
+                xml.link url_for(:controller => 'welcome', :only_path => false)
                 xml.pubDate CGI.rfc1123_date(@news.first.created_on)
                 xml.description l(:label_news_latest)
                 @news.each do |news|

app/views/layouts/base.rhtml +1 -1

             	<div id="navigation">
             		<ul>
-            	<li><%= link_to l(:label_home), { :controller => '' }, :class => "icon icon-home" %></li>
+            	<li><%= link_to l(:label_home), { :controller => 'welcome' }, :class => "icon icon-home" %></li>
             	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>
             	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>

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