jro_apps/redmine Commit - r749:650888c73b73

Added a named route for the home page....

Jean-Philippe Lang -

r749:650888c73b73

parent child

Context file:

r749:650888c73b73

Collapse all files

app/controllers/account_controller.rb +6 -6

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AccountController < ApplicationController
               layout 'base'
               helper :custom_fields
               include CustomFieldsHelper
               # prevents login action to be filtered by check_if_login_required application scope filter
               skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]
               # Show user's account
               def show
                 @user = User.find_active(params[:id])
                 @custom_values = @user.custom_values.find(:all, :include => :custom_field)
                 # show only public projects and private projects that the logged in user is also a member of
                 @memberships = @user.memberships.select do |membership|
                   membership.project.is_public? || (User.current.role_for_project(membership.project))
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Login request and validation
               def login
                 if request.get?
                   # Logout user
                   self.logged_user = nil
                 else
                   # Authenticate user
                   user = User.try_to_login(params[:login], params[:password])
                   if user
                     self.logged_user = user
                     # generate a key and set cookie if autologin
                     if params[:autologin] && Setting.autologin?
                       token = Token.create(:user => user, :action => 'autologin')
                       cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
                     end
                     redirect_back_or_default :controller => 'my', :action => 'page'
                   else
                     flash.now[:error] = l(:notice_account_invalid_creditentials)
                   end
                 end
               end
               # Log out current user and redirect to welcome page
               def logout
                 cookies.delete :autologin
                 Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged?
                 self.logged_user = nil
-                redirect_to :controller => 'welcome'
+                redirect_to home_url
               end
               # Enable user to choose a new password
               def lost_password
-                redirect_to :controller => 'welcome' and return unless Setting.lost_password?
+                redirect_to(home_url) && return unless Setting.lost_password?
                 if params[:token]
                   @token = Token.find_by_action_and_value("recovery", params[:token])
-                  redirect_to :controller => 'welcome' and return unless @token and !@token.expired?
+                  redirect_to(home_url) && return unless @token and !@token.expired?
                   @user = @token.user
                   if request.post?
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     if @user.save
                       @token.destroy
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                   render :template => "account/password_recovery"
                   return
                 else
                   if request.post?
                     user = User.find_by_mail(params[:mail])
                     # user not found in db
                     flash.now[:error] = l(:notice_account_unknown_email) and return unless user
                     # user uses an external authentification
                     flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id
                     # create a new token for password recovery
                     token = Token.new(:user => user, :action => "recovery")
                     if token.save
                       Mailer.deliver_lost_password(token)
                       flash[:notice] = l(:notice_account_lost_email_sent)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                 end
               end
               # User self-registration
               def register
-                redirect_to :controller => 'welcome' and return unless Setting.self_registration?
+                redirect_to(home_url) && return unless Setting.self_registration?
                 if params[:token]
                   token = Token.find_by_action_and_value("register", params[:token])
-                  redirect_to :controller => 'welcome' and return unless token and !token.expired?
+                  redirect_to(home_url) && return unless token and !token.expired?
                   user = token.user
-                  redirect_to :controller => 'welcome' and return unless user.status == User::STATUS_REGISTERED
+                  redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
                   user.status = User::STATUS_ACTIVE
                   if user.save
                     token.destroy
                     flash[:notice] = l(:notice_account_activated)
                     redirect_to :action => 'login'
                     return
                   end
                 else
                   if request.get?
                     @user = User.new(:language => Setting.default_language)
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                   else
                     @user = User.new(params[:user])
                     @user.admin = false
                     @user.login = params[:user][:login]
                     @user.status = User::STATUS_REGISTERED
                     @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                     token = Token.new(:user => @user, :action => "register")
                     if @user.save and token.save
                       Mailer.deliver_register(token)
                       flash[:notice] = l(:notice_account_register_done)
                       redirect_to :controller => 'account', :action => 'login'
                     end
                   end
                 end
               end
             private
               def logged_user=(user)
                 if user && user.is_a?(User)
                   User.current = user
                   session[:user_id] = user.id
                 else
                   User.current = User.anonymous
                   session[:user_id] = nil
                 end
               end
             end

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

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%=h html_title %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="<%= Redmine::Info.app_name %>" />
             <meta name="keywords" content="issue,bug,tracker" />
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "print", :media => "print" %>
             <%= javascript_include_tag :defaults %>
             <%= stylesheet_link_tag 'jstoolbar' %>
             <!--[if IE]>
                 <style type="text/css">
                   * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
                   body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
                 </style>
             <![endif]-->
             <!-- page specific tags --><%= yield :header_tags %>
             </head>
             <body>
             <div id="top-menu">
                 <div id="account">
                     <% if User.current.logged? %>
                         <%=l(:label_logged_as)%> <%= User.current.login %> -
                         <%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' } %>
                         <%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' } %>
                     <% else %>
                         <%= link_to l(:label_login), { :controller => 'account', :action => 'login' } %>
                         <%= link_to(l(:label_register), :controller => 'account',:action => 'register') if Setting.self_registration? %>
                     <% end %>
                 </div>
-                <%= link_to l(:label_home), { :controller => 'welcome' } %>
+                <%= link_to l(:label_home), home_url %>
                 <%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'} if User.current.logged? %>
                 <%= link_to l(:label_project_plural), { :controller => 'projects' } %>
                 <%= link_to l(:label_administration), { :controller => 'admin' } if User.current.admin? %>
             </div>
             <div id="header">
                 <div id="quick-search">
                     <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
                     <%= link_to l(:label_search), :controller => 'search', :action => 'index', :id => @project %>: <%= text_field_tag 'q', @question, :size => 20, :class => 'small' %>
                     <% end %>
                     <%= render :partial => 'layouts/project_selector' if User.current.memberships.any? %>
                 </div>
                 <h1><%= h(@project ? @project.name : Setting.app_title) %></h1>
                 <div id="main-menu">
                     <ul>
                         <% Redmine::MenuManager.allowed_items(:project_menu, User.current, @project).each do |item| %>
                         <% unless item.condition && !item.condition.call(@project) %>
                             <li><%= link_to l(item.name), {item.param => @project}.merge(item.url) %></li>
                         <% end %>
                         <% end if @project && !@project.new_record? %>
                     </ul>
                 </div>
             </div>
             <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
                 <div id="sidebar">
                     <%= yield :sidebar %>
                 </div>
                 <div id="content">
                     <div id="flash">
                         <%= content_tag('div', flash[:error], :class => 'error') if flash[:error] %>
                         <%= content_tag('div', flash[:notice], :class => 'notice') if flash[:notice] %>
                     </div>
                     <%= yield %>
                 </div>
             </div>
             <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
             <div id="footer">
                 <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang
             </div>
             </body>
             </html>

config/routes.rb +1 -3

             ActionController::Routing::Routes.draw do |map|
               # Add your own custom routes here.
               # The priority is based upon order of creation: first created -> highest priority.
               # Here's a sample route:
               # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
               # Keep in mind you can assign values other than :controller and :action
-              # You can have the root of your site routed by hooking up ''
+              map.home '', :controller => 'welcome'
-              # -- just remember to delete public/index.html.
-              map.connect '', :controller => "welcome"
               map.connect 'wiki/:id/:page/:action', :controller => 'wiki', :page => nil
               map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
               map.connect 'help/:ctrl/:page', :controller => 'help'
               #map.connect ':controller/:action/:id/:sort_key/:sort_order'
               map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
               map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
               map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
               # Allow downloading Web Service WSDL as a file with an extension
               # instead of a file named 'wsdl'
               map.connect ':controller/service.wsdl', :action => 'wsdl'
               # Install the default route as the lowest priority.
               map.connect ':controller/:action/:id'
             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