jro_apps/redmine Commit - r1726:2fdf4426cd8f

Moves @layout 'base'@ to ApplicationController....

Jean-Philippe Lang -

r1726:2fdf4426cd8f

parent child

Context file:

r1726:2fdf4426cd8f

Expand all files

app/controllers/account_controller.rb 0 -1

             # 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, :activate]
               # 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.member_of?(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[:username], params[:password])
                   if user.nil?
                     # Invalid credentials
                     flash.now[:error] = l(:notice_account_invalid_creditentials)
                   elsif user.new_record?
                     # Onthefly creation failed, display the registration form to fill/fix attributes
                     @user = user
                     session[:auth_source_registration] = {:login => user.login, :auth_source_id => user.auth_source_id }
                     render :action => 'register'
                   else
                     # Valid 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'
                   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 home_url
               end
               # Enable user to choose a new password
               def 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(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(home_url) && return unless Setting.self_registration? || session[:auth_source_registration]
                 if request.get?
                   session[:auth_source_registration] = nil
                   @user = User.new(:language => Setting.default_language)
                 else
                   @user = User.new(params[:user])
                   @user.admin = false
                   @user.status = User::STATUS_REGISTERED
                   if session[:auth_source_registration]
                     @user.status = User::STATUS_ACTIVE
                     @user.login = session[:auth_source_registration][:login]
                     @user.auth_source_id = session[:auth_source_registration][:auth_source_id]
                     if @user.save
                       session[:auth_source_registration] = nil
                       self.logged_user = @user
                       flash[:notice] = l(:notice_account_activated)
                       redirect_to :controller => 'my', :action => 'account'
                     end
                   else
                     @user.login = params[:user][:login]
                     @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                     case Setting.self_registration
                     when '1'
                       # Email activation
                       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 :action => 'login'
                       end
                     when '3'
                       # Automatic activation
                       @user.status = User::STATUS_ACTIVE
                       if @user.save
                         self.logged_user = @user
                         flash[:notice] = l(:notice_account_activated)
                         redirect_to :controller => 'my', :action => 'account'
                       end
                     else
                       # Manual activation by the administrator
                       if @user.save
                         # Sends an email to the administrators
                         Mailer.deliver_account_activation_request(@user)
                         flash[:notice] = l(:notice_account_pending)
                         redirect_to :action => 'login'
                       end
                     end
                   end
                 end
               end
               # Token based account activation
               def activate
                 redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
                 token = Token.find_by_action_and_value('register', params[:token])
                 redirect_to(home_url) && return unless token and !token.expired?
                 user = token.user
                 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)
                 end
                 redirect_to :action => 'login'
               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/controllers/admin_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 AdminController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
                 @no_configuration_data = Redmine::DefaultData::Loader::no_data?
               end
               def projects
                 sort_init 'name', 'asc'
                 sort_update
                 @status = params[:status] ? params[:status].to_i : 0
                 conditions = nil
                 conditions = ["status=?", @status] unless @status == 0
                 @project_count = Project.count(:conditions => conditions)
                 @project_pages = Paginator.new self, @project_count,
             								per_page_option,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
                                     :conditions => conditions,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "projects", :layout => false if request.xhr?
               end
               # Loads the default configuration
               # (roles, trackers, statuses, workflow, enumerations)
               def default_configuration
                 if request.post?
                   begin
                     Redmine::DefaultData::Loader::load(params[:lang])
                     flash[:notice] = l(:notice_default_data_loaded)
                   rescue Exception => e
                     flash[:error] = l(:error_can_t_load_default_data, e.message)
                   end
                 end
                 redirect_to :action => 'index'
               end
               def test_email
                 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
                 # Force ActionMailer to raise delivery errors so we can catch it
                 ActionMailer::Base.raise_delivery_errors = true
                 begin
                   @test = Mailer.deliver_test(User.current)
                   flash[:notice] = l(:notice_email_sent, User.current.mail)
                 rescue Exception => e
                   flash[:error] = l(:notice_email_error, e.message)
                 end
                 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
                 redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
               end
               def info
                 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
                 @flags = {
                   :default_admin_changed => User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?,
                   :file_repository_writable => File.writable?(Attachment.storage_path),
                   :rmagick_available => Object.const_defined?(:Magick)
                 }
                 @plugins = Redmine::Plugin.registered_plugins
               end
             end

app/controllers/application.rb +2 0

             # 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.
             require 'uri'
             class ApplicationController < ActionController::Base
+              layout 'base'
               before_filter :user_setup, :check_if_login_required, :set_localization
               filter_parameter_logging :password
               include Redmine::MenuManager::MenuController
               helper Redmine::MenuManager::MenuHelper
               REDMINE_SUPPORTED_SCM.each do |scm|
                 require_dependency "repository/#{scm.underscore}"
               end
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               def user_setup
                 # Check the settings cache for each request
                 Setting.check_cache
                 # Find the current user
                 User.current = find_current_user
               end
               # Returns the current user or nil if no user is logged in
               def find_current_user
                 if session[:user_id]
                   # existing session
                   (User.find_active(session[:user_id]) rescue nil)
                 elsif cookies[:autologin] && Setting.autologin?
                   # auto-login feature
                   User.find_by_autologin_key(cookies[:autologin])
                 elsif params[:key] && accept_key_auth_actions.include?(params[:action])
                   # RSS key authentication
                   User.find_by_rss_key(params[:key])
                 end
               end
               # check if login is globally required to access the application
               def check_if_login_required
                 # no check needed if user is already logged in
                 return true if User.current.logged?
                 require_login if Setting.login_required?
               end
               def set_localization
                 User.current.language = nil unless User.current.logged?
                 lang = begin
                   if !User.current.language.blank? && GLoc.valid_language?(User.current.language)
                     User.current.language
                   elsif request.env['HTTP_ACCEPT_LANGUAGE']
                     accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase
                     if !accept_lang.blank? && (GLoc.valid_language?(accept_lang) || GLoc.valid_language?(accept_lang = accept_lang.split('-').first))
                       User.current.language = accept_lang
                     end
                   end
                 rescue
                   nil
                 end || Setting.default_language
                 set_language_if_valid(lang)
               end
               def require_login
                 if !User.current.logged?
                   redirect_to :controller => "account", :action => "login", :back_url => request.request_uri
                   return false
                 end
                 true
               end
               def require_admin
                 return unless require_login
                 if !User.current.admin?
                   render_403
                   return false
                 end
                 true
               end
               # Authorize the user for the requested action
               def authorize(ctrl = params[:controller], action = params[:action])
                 allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project)
                 allowed ? true : (User.current.logged? ? render_403 : require_login)
               end
               # make sure that the user is a member of the project (or admin) if project is private
               # used as a before_filter for actions that do not require any particular permission on the project
               def check_project_privacy
                 if @project && @project.active?
                   if @project.is_public? || User.current.member_of?(@project) || User.current.admin?
                     true
                   else
                     User.current.logged? ? render_403 : require_login
                   end
                 else
                   @project = nil
                   render_404
                   false
                 end
               end
               def redirect_back_or_default(default)
                 back_url = params[:back_url]
                 if !back_url.blank?
                   uri = URI.parse(back_url)
                   # do not redirect user to another host
                   if uri.relative? || (uri.host == request.host)
                     redirect_to(back_url) and return
                   end
                 end
                 redirect_to default
               end
               def render_403
                 @project = nil
                 render :template => "common/403", :layout => !request.xhr?, :status => 403
                 return false
               end
               def render_404
                 render :template => "common/404", :layout => !request.xhr?, :status => 404
                 return false
               end
               def render_error(msg)
                 flash.now[:error] = msg
                 render :nothing => true, :layout => !request.xhr?, :status => 500
               end
               def render_feed(items, options={})
                 @items = items || []
                 @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
                 @items = @items.slice(0, Setting.feeds_limit.to_i)
                 @title = options[:title] || Setting.app_title
                 render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'
               end
               def self.accept_key_auth(*actions)
                 actions = actions.flatten.map(&:to_s)
                 write_inheritable_attribute('accept_key_auth_actions', actions)
               end
               def accept_key_auth_actions
                 self.class.read_inheritable_attribute('accept_key_auth_actions') || []
               end
               # TODO: move to model
               def attach_files(obj, attachments)
                 attached = []
                 if attachments && attachments.is_a?(Hash)
                   attachments.each_value do |attachment|
                     file = attachment['file']
                     next unless file && file.size > 0
                     a = Attachment.create(:container => obj,
                                           :file => file,
                                           :description => attachment['description'].to_s.strip,
                                           :author => User.current)
                     attached << a unless a.new_record?
                   end
                 end
                 attached
               end
               # Returns the number of objects that should be displayed
               # on the paginated list
               def per_page_option
                 per_page = nil
                 if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
                   per_page = params[:per_page].to_s.to_i
                   session[:per_page] = per_page
                 elsif session[:per_page]
                   per_page = session[:per_page]
                 else
                   per_page = Setting.per_page_options_array.first || 25
                 end
                 per_page
               end
               # qvalues http header parser
               # code taken from webrick
               def parse_qvalues(value)
                 tmp = []
                 if value
                   parts = value.split(/,\s*/)
                   parts.each {|part|
                     if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
                       val = m[1]
                       q = (m[2] or 1).to_f
                       tmp.push([val, q])
                     end
                   }
                   tmp = tmp.sort_by{|val, q| -q}
                   tmp.collect!{|val, q| val}
                 end
                 return tmp
               end
               # Returns a string that can be used as filename value in Content-Disposition header
               def filename_for_content_disposition(name)
                 request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
               end
             end

app/controllers/attachments_controller.rb 0 -1

             # 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 AttachmentsController < ApplicationController
-              layout 'base'
               before_filter :find_project
               def show
                 if @attachment.is_diff?
                   @diff = File.new(@attachment.diskfile, "rb").read
                   render :action => 'diff'
                 elsif @attachment.is_text?
                   @content = File.new(@attachment.diskfile, "rb").read
                   render :action => 'file'
                 elsif
                   download
                 end
               end
               def download
                 @attachment.increment_download if @attachment.container.is_a?(Version)
                 # images are sent inline
                 send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                                 :type => @attachment.content_type,
                                                 :disposition => (@attachment.image? ? 'inline' : 'attachment')
               end
             private
               def find_project
                 @attachment = Attachment.find(params[:id])
                 # Show 404 if the filename in the url is wrong
                 raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
                 @project = @attachment.project
                 permission = @attachment.container.is_a?(Version) ? :view_files : "view_#{@attachment.container.class.name.underscore.pluralize}".to_sym
                 allowed = User.current.allowed_to?(permission, @project)
                 allowed ? true : (User.current.logged? ? render_403 : require_login)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/auth_sources_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 AuthSourcesController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy, :create, :update ],
                      :redirect_to => { :action => :list }
               def list
                 @auth_source_pages, @auth_sources = paginate :auth_sources, :per_page => 10
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @auth_source = AuthSourceLdap.new
               end
               def create
                 @auth_source = AuthSourceLdap.new(params[:auth_source])
                 if @auth_source.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @auth_source = AuthSource.find(params[:id])
               end
               def update
                 @auth_source = AuthSource.find(params[:id])
                 if @auth_source.update_attributes(params[:auth_source])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 else
                   render :action => 'edit'
                 end
               end
               def test_connection
                 @auth_method = AuthSource.find(params[:id])
                 begin
                   @auth_method.test_connection
                   flash[:notice] = l(:notice_successful_connection)
                 rescue => text
                   flash[:error] = "Unable to connect (#{text})"
                 end
                 redirect_to :action => 'list'
               end
               def destroy
                 @auth_source = AuthSource.find(params[:id])
                 unless @auth_source.users.find(:first)
                   @auth_source.destroy
                   flash[:notice] = l(:notice_successful_delete)
                 end
                 redirect_to :action => 'list'
               end
             end

app/controllers/boards_controller.rb 0 -1

             # 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 BoardsController < ApplicationController
-              layout 'base'
               before_filter :find_project, :authorize
               helper :messages
               include MessagesHelper
               helper :sort
               include SortHelper
               helper :watchers
               include WatchersHelper
               def index
                 @boards = @project.boards
                 # show the board if there is only one
                 if @boards.size == 1
                   @board = @boards.first
                   show
                 end
               end
               def show
                 sort_init "#{Message.table_name}.updated_on", "desc"
                 sort_update
                 @topic_count = @board.topics.count
                 @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
                 @topics =  @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC, #{sort_clause}",
                                               :include => [:author, {:last_reply => :author}],
                                               :limit  =>  @topic_pages.items_per_page,
                                               :offset =>  @topic_pages.current.offset
                 render :action => 'show', :layout => !request.xhr?
               end
               verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
               def new
                 @board = Board.new(params[:board])
                 @board.project = @project
                 if request.post? && @board.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
                 end
               end
               def edit
                 if request.post? && @board.update_attributes(params[:board])
                   case params[:position]
                   when 'highest'; @board.move_to_top
                   when 'higher'; @board.move_higher
                   when 'lower'; @board.move_lower
                   when 'lowest'; @board.move_to_bottom
                   end if params[:position]
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
                 end
               end
               def destroy
                 @board.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
               end
             private
               def find_project
                 @project = Project.find(params[:project_id])
                 @board = @project.boards.find(params[:id]) if params[:id]
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/custom_fields_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 CustomFieldsController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.class.name }
                 @tab = params[:tab] || 'IssueCustomField'
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 case params[:type]
                   when "IssueCustomField"
                     @custom_field = IssueCustomField.new(params[:custom_field])
                     @custom_field.trackers = Tracker.find(params[:tracker_ids]) if params[:tracker_ids]
                   when "UserCustomField"
                     @custom_field = UserCustomField.new(params[:custom_field])
                   when "ProjectCustomField"
                     @custom_field = ProjectCustomField.new(params[:custom_field])
                   when "TimeEntryCustomField"
                     @custom_field = TimeEntryCustomField.new(params[:custom_field])
                   else
                     redirect_to :action => 'list'
                     return
                 end
                 if request.post? and @custom_field.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list', :tab => @custom_field.class.name
                 end
                 @trackers = Tracker.find(:all, :order => 'position')
               end
               def edit
                 @custom_field = CustomField.find(params[:id])
                 if request.post? and @custom_field.update_attributes(params[:custom_field])
                   if @custom_field.is_a? IssueCustomField
                     @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list', :tab => @custom_field.class.name
                 end
                 @trackers = Tracker.find(:all, :order => 'position')
               end
               def move
                 @custom_field = CustomField.find(params[:id])
                 case params[:position]
                 when 'highest'
                   @custom_field.move_to_top
                 when 'higher'
                   @custom_field.move_higher
                 when 'lower'
                   @custom_field.move_lower
                 when 'lowest'
                   @custom_field.move_to_bottom
                 end if params[:position]
                 redirect_to :action => 'list', :tab => @custom_field.class.name
               end
               def destroy
                 @custom_field = CustomField.find(params[:id]).destroy
                 redirect_to :action => 'list', :tab => @custom_field.class.name
               rescue
                 flash[:error] = "Unable to delete custom field"
                 redirect_to :action => 'list'
               end
             end

app/controllers/documents_controller.rb 0 -1

             # 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 DocumentsController < ApplicationController
-              layout 'base'
               before_filter :find_project, :only => [:index, :new]
               before_filter :find_document, :except => [:index, :new]
               before_filter :authorize
               helper :attachments
               def index
                 @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
                 documents = @project.documents.find :all, :include => [:attachments, :category]
                 case @sort_by
                 when 'date'
                   @grouped = documents.group_by {|d| d.created_on.to_date }
                 when 'title'
                   @grouped = documents.group_by {|d| d.title.first.upcase}
                 when 'author'
                   @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
                 else
                   @grouped = documents.group_by(&:category)
                 end
                 render :layout => false if request.xhr?
               end
               def show
                 @attachments = @document.attachments.find(:all, :order => "created_on DESC")
               end
               def new
                 @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
                   attach_files(@document, params[:attachments])
                   flash[:notice] = l(:notice_successful_create)
                   Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
                   redirect_to :action => 'index', :project_id => @project
                 end
               end
               def edit
                 @categories = Enumeration::get_values('DCAT')
                 if request.post? and @document.update_attributes(params[:document])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @document
                 end
               end
               def destroy
                 @document.destroy
                 redirect_to :controller => 'documents', :action => 'index', :project_id => @project
               end
               def add_attachment
                 attachments = attach_files(@document, params[:attachments])
                 Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
                 redirect_to :action => 'show', :id => @document
               end
               def destroy_attachment
                 @document.attachments.find(params[:attachment_id]).destroy
                 redirect_to :action => 'show', :id => @document
               end
             private
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_document
                 @document = Document.find(params[:id])
                 @project = @document.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/enumerations_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 EnumerationsController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy, :create, :update ],
                      :redirect_to => { :action => :list }
               def list
               end
               def new
                 @enumeration = Enumeration.new(:opt => params[:opt])
               end
               def create
                 @enumeration = Enumeration.new(params[:enumeration])
                 if @enumeration.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list', :opt => @enumeration.opt
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @enumeration = Enumeration.find(params[:id])
               end
               def update
                 @enumeration = Enumeration.find(params[:id])
                 if @enumeration.update_attributes(params[:enumeration])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list', :opt => @enumeration.opt
                 else
                   render :action => 'edit'
                 end
               end
               def move
                 @enumeration = Enumeration.find(params[:id])
                 case params[:position]
                 when 'highest'
                   @enumeration.move_to_top
                 when 'higher'
                   @enumeration.move_higher
                 when 'lower'
                   @enumeration.move_lower
                 when 'lowest'
                   @enumeration.move_to_bottom
                 end if params[:position]
                 redirect_to :action => 'index'
               end
               def destroy
                 @enumeration = Enumeration.find(params[:id])
                 if !@enumeration.in_use?
                   # No associated objects
                   @enumeration.destroy
                   redirect_to :action => 'index'
                 elsif params[:reassign_to_id]
                   if reassign_to = Enumeration.find_by_opt_and_id(@enumeration.opt, params[:reassign_to_id])
                     @enumeration.destroy(reassign_to)
                     redirect_to :action => 'index'
                   end
                 end
                 @enumerations = Enumeration.get_values(@enumeration.opt) - [@enumeration]
               #rescue
               #  flash[:error] = 'Unable to delete enumeration'
               #  redirect_to :action => 'index'
               end
             end

app/controllers/issue_categories_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 IssueCategoriesController < ApplicationController
-              layout 'base'
               menu_item :settings
               before_filter :find_project, :authorize
               verify :method => :post, :only => :destroy
               def edit
                 if request.post? and @category.update_attributes(params[:category])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
                 end
               end
               def destroy
                 @issue_count = @category.issues.size
                 if @issue_count == 0
                   # No issue assigned to this category
                   @category.destroy
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
                 elsif params[:todo]
                   reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign'
                   @category.destroy(reassign_to)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
                 end
                 @categories = @project.issue_categories - [@category]
               end
             private
               def find_project
                 @category = IssueCategory.find(params[:id])
                 @project = @category.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/issue_relations_controller.rb 0 -1

             # 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 IssueRelationsController < ApplicationController
-              layout 'base'
               before_filter :find_project, :authorize
               def new
                 @relation = IssueRelation.new(params[:relation])
                 @relation.issue_from = @issue
                 @relation.save if request.post?
                 respond_to do |format|
                   format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
                   format.js do
                     render :update do |page|
                       page.replace_html "relations", :partial => 'issues/relations'
                       if @relation.errors.empty?
                         page << "$('relation_delay').value = ''"
                         page << "$('relation_issue_to_id').value = ''"
                       end
                     end
                   end
                 end
               end
               def destroy
                 relation = IssueRelation.find(params[:id])
                 if request.post? && @issue.relations.include?(relation)
                   relation.destroy
                   @issue.reload
                 end
                 respond_to do |format|
                   format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
                   format.js { render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'} }
                 end
               end
             private
               def find_project
                 @issue = Issue.find(params[:issue_id])
                 @project = @issue.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/issue_statuses_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 IssueStatusesController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               verify :method => :post, :only => [ :destroy, :create, :update, :move ],
                      :redirect_to => { :action => :list }
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 25, :order => "position"
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @issue_status = IssueStatus.new
               end
               def create
                 @issue_status = IssueStatus.new(params[:issue_status])
                 if @issue_status.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @issue_status = IssueStatus.find(params[:id])
               end
               def update
                 @issue_status = IssueStatus.find(params[:id])
                 if @issue_status.update_attributes(params[:issue_status])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 else
                   render :action => 'edit'
                 end
               end
               def move
                 @issue_status = IssueStatus.find(params[:id])
                 case params[:position]
                 when 'highest'
                   @issue_status.move_to_top
                 when 'higher'
                   @issue_status.move_higher
                 when 'lower'
                   @issue_status.move_lower
                 when 'lowest'
                   @issue_status.move_to_bottom
                 end if params[:position]
                 redirect_to :action => 'list'
               end
               def destroy
                 IssueStatus.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:error] = "Unable to delete issue status"
                 redirect_to :action => 'list'
               end
             end

app/controllers/issues_controller.rb 0 -1

             # 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 IssuesController < ApplicationController
-              layout 'base'
               menu_item :new_issue, :only => :new
               before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
               before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
               before_filter :find_project, :only => [:new, :update_form, :preview]
               before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
               before_filter :find_optional_project, :only => [:index, :changes]
               accept_key_auth :index, :changes
               helper :journals
               helper :projects
               include ProjectsHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issue_relations
               include IssueRelationsHelper
               helper :watchers
               include WatchersHelper
               helper :attachments
               include AttachmentsHelper
               helper :queries
               helper :sort
               include SortHelper
               include IssuesHelper
               helper :timelog
               def index
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 if @query.valid?
                   limit = per_page_option
                   respond_to do |format|
                     format.html { }
                     format.atom { }
                     format.csv  { limit = Setting.issues_export_limit.to_i }
                     format.pdf  { limit = Setting.issues_export_limit.to_i }
                   end
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, limit, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
                                        :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
                                        :conditions => @query.statement,
                                        :limit  =>  limit,
                                        :offset =>  @issue_pages.current.offset
                   respond_to do |format|
                     format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
                     format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                     format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
                     format.pdf  { send_data(render(:template => 'issues/index.rfpdf', :layout => false), :type => 'application/pdf', :filename => 'export.pdf') }
                   end
                 else
                   # Send html if the query is not valid
                   render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def changes
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 if @query.valid?
                   @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
                                                  :conditions => @query.statement,
                                                  :limit => 25,
                                                  :order => "#{Journal.table_name}.created_on DESC"
                 end
                 @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
                 render :layout => false, :content_type => 'application/atom+xml'
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                 @journals.each_with_index {|j,i| j.indice = i+1}
                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @priorities = Enumeration::get_values('IPRI')
                 @time_entry = TimeEntry.new
                 respond_to do |format|
                   format.html { render :template => 'issues/show.rhtml' }
                   format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
                   format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
                 end
               end
               # Add a new issue
               # The new issue will be created from an existing one if copy_from parameter is given
               def new
                 @issue = Issue.new
                 @issue.copy_from(params[:copy_from]) if params[:copy_from]
                 @issue.project = @project
                 # Tracker must be set before custom field values
                 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
                 if @issue.tracker.nil?
                   flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
                   render :nothing => true, :layout => true
                   return
                 end
                 @issue.attributes = params[:issue]
                 @issue.author = User.current
                 default_status = IssueStatus.default
                 unless default_status
                   flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
                   render :nothing => true, :layout => true
                   return
                 end
                 @issue.status = default_status
                 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)).uniq
                 if request.get? || request.xhr?
                   @issue.start_date ||= Date.today
                 else
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                   # Check that the user is allowed to apply the requested status
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   if @issue.save
                     attach_files(@issue, params[:attachments])
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
                     redirect_to :controller => 'issues', :action => 'show', :id => @issue
                     return
                   end
                 end
                 @priorities = Enumeration::get_values('IPRI')
                 render :layout => !request.xhr?
               end
               # Attributes that can be updated on workflow transition (without :edit permission)
               # TODO: make it configurable (at least per role)
               UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
               def edit
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @priorities = Enumeration::get_values('IPRI')
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new
                 @notes = params[:notes]
                 journal = @issue.init_journal(User.current, @notes)
                 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                 if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
                   attrs = params[:issue].dup
                   attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
                   attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
                   @issue.attributes = attrs
                 end
                 if request.post?
                   @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                   @time_entry.attributes = params[:time_entry]
                   attachments = attach_files(@issue, params[:attachments])
                   attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                   if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save
                     # Log spend time
                     if current_role.allowed_to?(:log_time)
                       @time_entry.save
                     end
                     if !journal.new_record?
                       # Only send notification if something was actually changed
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     end
                     redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
                   end
                 end
               rescue ActiveRecord::StaleObjectError
                 # Optimistic locking exception
                 flash.now[:error] = l(:notice_locking_conflict)
               end
               def reply
                 journal = Journal.find(params[:journal_id]) if params[:journal_id]
                 if journal
                   user = journal.user
                   text = journal.notes
                 else
                   user = @issue.author
                   text = @issue.description
                 end
                 content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
                 content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
                 render(:update) { |page|
                   page.<< "$('notes').value = \"#{content}\";"
                   page.show 'update'
                   page << "Form.Element.focus('notes');"
                   page << "Element.scrollTo('update');"
                   page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
                 }
               end
               # Bulk edit a set of issues
               def bulk_edit
                 if request.post?
                   status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
                   priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
                   assigned_to = (params[:assigned_to_id].blank? || params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
                   category = (params[:category_id].blank? || params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
                   fixed_version = (params[:fixed_version_id].blank? || params[:fixed_version_id] == 'none') ? nil : @project.versions.find_by_id(params[:fixed_version_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     journal = issue.init_journal(User.current, params[:notes])
                     issue.priority = priority if priority
                     issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
                     issue.category = category if category || params[:category_id] == 'none'
                     issue.fixed_version = fixed_version if fixed_version || params[:fixed_version_id] == 'none'
                     issue.start_date = params[:start_date] unless params[:start_date].blank?
                     issue.due_date = params[:due_date] unless params[:due_date].blank?
                     issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
                     # Don't save any change to the issue if the user is not authorized to apply the requested status
                     if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
                       # Send notification for each issue (if changed)
                       Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
                     else
                       # Keep unsaved issue ids to display them in flash error
                       unsaved_issue_ids << issue.id
                     end
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
                     flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   return
                 end
                 # Find potential statuses the user could be allowed to switch issues to
                 @available_statuses = Workflow.find(:all, :include => :new_status,
                                                           :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
               end
               def move
                 @allowed_projects = []
                 # find projects to which the user is allowed to move the issue
                 if User.current.admin?
                   # admin is allowed to move issues to any active (visible) project
                   @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
                 else
                   User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
                 end
                 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
                 @target_project ||= @project
                 @trackers = @target_project.trackers
                 if request.post?
                   new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     issue.init_journal(User.current)
                     unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
                     flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   return
                 end
                 render :layout => false if request.xhr?
               end
               def destroy
                 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
                 if @hours > 0
                   case params[:todo]
                   when 'destroy'
                     # nothing to do
                   when 'nullify'
                     TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
                   when 'reassign'
                     reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                     if reassign_to.nil?
                       flash.now[:error] = l(:error_issue_not_found_in_project)
                       return
                     else
                       TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
                     end
                   else
                     # display the destroy form
                     return
                   end
                 end
                 @issues.each(&:destroy)
                 redirect_to :action => 'index', :project_id => @project
               end
               def destroy_attachment
                 a = @issue.attachments.find(params[:attachment_id])
                 a.destroy
                 journal = @issue.init_journal(User.current)
                 journal.details << JournalDetail.new(:property => 'attachment',
                                                      :prop_key => a.id,
                                                      :old_value => a.filename)
                 journal.save
                 redirect_to :action => 'show', :id => @issue
               end
               def context_menu
                 @issues = Issue.find_all_by_id(params[:ids], :include => :project)
                 if (@issues.size == 1)
                   @issue = @issues.first
                   @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                   @assignables = @issue.assignable_users
                   @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
                 end
                 projects = @issues.collect(&:project).compact.uniq
                 @project = projects.first if projects.size == 1
                 @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
                         :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
                         :update => (@issue && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && !@allowed_statuses.empty?))),
                         :move => (@project && User.current.allowed_to?(:move_issues, @project)),
                         :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                         :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
                         }
                 @priorities = Enumeration.get_values('IPRI').reverse
                 @statuses = IssueStatus.find(:all, :order => 'position')
                 @back = request.env['HTTP_REFERER']
                 render :layout => false
               end
               def update_form
                 @issue = Issue.new(params[:issue])
                 render :action => :new, :layout => false
               end
               def preview
                 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
                 @attachements = @issue.attachments if @issue
                 @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
                 render :partial => 'common/preview'
               end
             private
               def find_issue
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Filter for bulk operations
               def find_issues
                 @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                 raise ActiveRecord::RecordNotFound if @issues.empty?
                 projects = @issues.collect(&:project).compact.uniq
                 if projects.size == 1
                   @project = projects.first
                 else
                   # TODO: let users bulk edit/move/destroy issues from different projects
                   render_error 'Can not bulk edit/move/destroy issues from different projects' and return false
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:project_id]
                 @project = Project.find(params[:project_id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if !params[:query_id].blank?
                   cond = "project_id IS NULL"
                   cond << " OR project_id = #{@project.id}" if @project
                   @query = Query.find(params[:query_id], :conditions => cond)
                   @query.project = @project
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                 else
                   if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_")
                     @query.project = @project
                     if params[:fields] and params[:fields].is_a? Array
                       params[:fields].each do |field|
                         @query.add_filter(field, params[:operators][field], params[:values][field])
                       end
                     else
                       @query.available_filters.keys.each do |field|
                         @query.add_short_filter(field, params[field]) if params[field]
                       end
                     end
                     session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
                   else
                     @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
                     @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
                     @query.project = @project
                   end
                 end
               end
             end

app/controllers/journals_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  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 JournalsController < ApplicationController
-              layout 'base'
               before_filter :find_journal
               def edit
                 if request.post?
                   @journal.update_attributes(:notes => params[:notes]) if params[:notes]
                   @journal.destroy if @journal.details.empty? && @journal.notes.blank?
                   respond_to do |format|
                     format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
                     format.js { render :action => 'update' }
                   end
                 end
               end
             private
               def find_journal
                 @journal = Journal.find(params[:id])
                 render_403 and return false unless @journal.editable_by?(User.current)
                 @project = @journal.journalized.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/members_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 MembersController < ApplicationController
-              layout 'base'
               before_filter :find_member, :except => :new
               before_filter :find_project, :only => :new
               before_filter :authorize
               def new
                 @project.members << Member.new(params[:member]) if request.post?
                 respond_to do |format|
                   format.html { redirect_to :action => 'settings', :tab => 'members', :id => @project }
                   format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
                 end
               end
               def edit
                 if request.post? and @member.update_attributes(params[:member])
               	 respond_to do |format|
                     format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                     format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
                   end
                 end
               end
               def destroy
                 @member.destroy
             	respond_to do |format|
                   format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                   format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_member
                 @member = Member.find(params[:id])
                 @project = @member.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/messages_controller.rb 0 -1

             # 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 MessagesController < ApplicationController
-              layout 'base'
               menu_item :boards
               before_filter :find_board, :only => [:new, :preview]
               before_filter :find_message, :except => [:new, :preview]
               before_filter :authorize, :except => :preview
               verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
               helper :attachments
               include AttachmentsHelper
               # Show a topic and its replies
               def show
                 @replies = @topic.children
                 @replies.reverse! if User.current.wants_comments_in_reverse_order?
                 @reply = Message.new(:subject => "RE: #{@message.subject}")
                 render :action => "show", :layout => false if request.xhr?
               end
               # Create a new topic
               def new
                 @message = Message.new(params[:message])
                 @message.author = User.current
                 @message.board = @board
                 if params[:message] && User.current.allowed_to?(:edit_messages, @project)
                   @message.locked = params[:message]['locked']
                   @message.sticky = params[:message]['sticky']
                 end
                 if request.post? && @message.save
                   attach_files(@message, params[:attachments])
                   redirect_to :action => 'show', :id => @message
                 end
               end
               # Reply to a topic
               def reply
                 @reply = Message.new(params[:reply])
                 @reply.author = User.current
                 @reply.board = @board
                 @topic.children << @reply
                 if !@reply.new_record?
                   attach_files(@reply, params[:attachments])
                 end
                 redirect_to :action => 'show', :id => @topic
               end
               # Edit a message
               def edit
                 if params[:message] && User.current.allowed_to?(:edit_messages, @project)
                   @message.locked = params[:message]['locked']
                   @message.sticky = params[:message]['sticky']
                 end
                 if request.post? && @message.update_attributes(params[:message])
                   attach_files(@message, params[:attachments])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @topic
                 end
               end
               # Delete a messages
               def destroy
                 @message.destroy
                 redirect_to @message.parent.nil? ?
                   { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
                   { :action => 'show', :id => @message.parent }
               end
               def preview
                 message = @board.messages.find_by_id(params[:id])
                 @attachements = message.attachments if message
                 @text = (params[:message] || params[:reply])[:content]
                 render :partial => 'common/preview'
               end
             private
               def find_message
                 find_board
                 @message = @board.messages.find(params[:id], :include => :parent)
                 @topic = @message.root
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_board
                 @board = Board.find(params[:board_id], :include => :project)
                 @project = @board.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/my_controller.rb +2 -3

             # redMine - project management software
             # Copyright (C) 2006  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 MyController < ApplicationController
-              helper :issues
-              layout 'base'
               before_filter :require_login
+              helper :issues
               BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
                          'issuesreportedbyme' => :label_reported_issues,
                          'issueswatched' => :label_watched_issues,
                          'news' => :label_news_latest,
                          'calendar' => :label_calendar,
                          'documents' => :label_document_plural,
                          'timelog' => :label_spent_time
                        }.freeze
               DEFAULT_LAYOUT = {  'left' => ['issuesassignedtome'],
                                   'right' => ['issuesreportedbyme']
                                }.freeze
               verify :xhr => true,
                      :session => :page_layout,
                      :only => [:add_block, :remove_block, :order_blocks]
               def index
                 page
                 render :action => 'page'
               end
               # Show user's page
               def page
                 @user = User.current
                 @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
               end
               # Edit user's account
               def account
                 @user = User.current
                 @pref = @user.pref
                 if request.post?
                   @user.attributes = params[:user]
                   @user.mail_notification = (params[:notification_option] == 'all')
                   @user.pref.attributes = params[:pref]
                   @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                   if @user.save
                     @user.pref.save
                     @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
                     set_language_if_valid @user.language
                     flash[:notice] = l(:notice_account_updated)
                     redirect_to :action => 'account'
                     return
                   end
                 end
                 @notification_options = [[l(:label_user_mail_option_all), 'all'],
                                          [l(:label_user_mail_option_none), 'none']]
                 # Only users that belong to more than 1 project can select projects for which they are notified
                 # Note that @user.membership.size would fail since AR ignores :include association option when doing a count
                 @notification_options.insert 1, [l(:label_user_mail_option_selected), 'selected'] if @user.memberships.length > 1
                 @notification_option = @user.mail_notification? ? 'all' : (@user.notified_projects_ids.empty? ? 'none' : 'selected')
               end
               # Manage user's password
               def password
                 @user = User.current
                 flash[:error] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
                 if request.post?
                   if @user.check_password?(params[:password])
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     if @user.save
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to :action => 'account'
                     end
                   else
                     flash[:error] = l(:notice_account_wrong_password)
                   end
                 end
               end
               # Create a new feeds key
               def reset_rss_key
                 if request.post? && User.current.rss_token
                   User.current.rss_token.destroy
                   flash[:notice] = l(:notice_feeds_access_key_reseted)
                 end
                 redirect_to :action => 'account'
               end
               # User's page layout configuration
               def page_layout
                 @user = User.current
                 @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
                 session[:page_layout] = @blocks
                 %w(top left right).each {|f| session[:page_layout][f] ||= [] }
                 @block_options = []
                 BLOCKS.each {|k, v| @block_options << [l(v), k]}
               end
               # Add a block to user's page
               # The block is added on top of the page
               # params[:block] : id of the block to add
               def add_block
                 block = params[:block]
                 render(:nothing => true) and return unless block && (BLOCKS.keys.include? block)
                 @user = User.current
                 # remove if already present in a group
                 %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
                 # add it on top
                 session[:page_layout]['top'].unshift block
                 render :partial => "block", :locals => {:user => @user, :block_name => block}
               end
               # Remove a block to user's page
               # params[:block] : id of the block to remove
               def remove_block
                 block = params[:block]
                 # remove block in all groups
                 %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
                 render :nothing => true
               end
               # Change blocks order on user's page
               # params[:group] : group to order (top, left or right)
               # params[:list-(top|left|right)] : array of block ids of the group
               def order_blocks
                 group = params[:group]
                 group_items = params["list-#{group}"]
                 if group_items and group_items.is_a? Array
                   # remove group blocks if they are presents in other groups
                   %w(top left right).each {|f|
                     session[:page_layout][f] = (session[:page_layout][f] || []) - group_items
                   }
                   session[:page_layout][group] = group_items
                 end
                 render :nothing => true
               end
               # Save user's page layout
               def page_layout_save
                 @user = User.current
                 @user.pref[:my_page_layout] = session[:page_layout] if session[:page_layout]
                 @user.pref.save
                 session[:page_layout] = nil
                 redirect_to :action => 'page'
               end
             end

app/controllers/news_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 NewsController < ApplicationController
-              layout 'base'
               before_filter :find_news, :except => [:new, :index, :preview]
               before_filter :find_project, :only => [:new, :preview]
               before_filter :authorize, :except => [:index, :preview]
               before_filter :find_optional_project, :only => :index
               accept_key_auth :index
               def index
                 @news_pages, @newss = paginate :news,
                                                :per_page => 10,
                                                :conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
                                                :include => [:author, :project],
                                                :order => "#{News.table_name}.created_on DESC"
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
                 end
               end
               def show
                 @comments = @news.comments
                 @comments.reverse! if User.current.wants_comments_in_reverse_order?
               end
               def new
                 @news = News.new(:project => @project, :author => User.current)
                 if request.post?
                   @news.attributes = params[:news]
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
                     redirect_to :controller => 'news', :action => 'index', :project_id => @project
                   end
                 end
               end
               def edit
                 if request.post? and @news.update_attributes(params[:news])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @news
                 end
               end
               def add_comment
                 @comment = Comment.new(params[:comment])
                 @comment.author = User.current
                 if @news.comments << @comment
                   flash[:notice] = l(:label_comment_added)
                   redirect_to :action => 'show', :id => @news
                 else
                   render :action => 'show'
                 end
               end
               def destroy_comment
                 @news.comments.find(params[:comment_id]).destroy
                 redirect_to :action => 'show', :id => @news
               end
               def destroy
                 @news.destroy
                 redirect_to :action => 'index', :project_id => @project
               end
               def preview
                 @text = (params[:news] ? params[:news][:description] : nil)
                 render :partial => 'common/preview'
               end
             private
               def find_news
                 @news = News.find(params[:id])
                 @project = @news.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:project_id]
                 @project = Project.find(params[:project_id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/projects_controller.rb 0 -1

             # 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 ProjectsController < ApplicationController
-              layout 'base'
               menu_item :overview
               menu_item :activity, :only => :activity
               menu_item :roadmap, :only => :roadmap
               menu_item :files, :only => [:list_files, :add_file]
               menu_item :settings, :only => :settings
               menu_item :issues, :only => [:changelog]
               before_filter :find_project, :except => [ :index, :list, :add, :activity ]
               before_filter :find_optional_project, :only => :activity
               before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy, :activity ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
               accept_key_auth :activity, :calendar
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issues
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
               # Lists visible projects
               def index
                 projects = Project.find :all,
                                         :conditions => Project.visible_by(User.current),
                                         :include => :parent
                 respond_to do |format|
                   format.html {
                     @project_tree = projects.group_by {|p| p.parent || p}
                     @project_tree.keys.each {|p| @project_tree[p] -= [p]}
                   }
                   format.atom {
                     render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i),
                                               :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                   }
                 end
               end
               # Add a new project
               def add
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @root_projects = Project.find(:all,
                                               :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                               :order => 'name')
                 @project = Project.new(params[:project])
                 if request.get?
                   @project.trackers = Tracker.all
                   @project.is_public = Setting.default_projects_public?
                   @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 else
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
                 Issue.visible_by(User.current) do
                   @open_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                   @total_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => cond)
                 end
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
                                                :conditions => cond).to_f
                 end
                 @key = User.current.rss_key
               end
               def settings
                 @root_projects = Project.find(:all,
                                               :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
                                               :order => 'name')
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.all
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               def modules
                 @project.enabled_module_names = params[:enabled_modules]
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end
               def archive
                 @project.archive if request.post? && @project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.post? and params[:confirm]
                   @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
                 # hide project in layout
                 @project = nil
               end
               # Add a new issue category to @project
               def add_issue_category
                 @category = @project.issue_categories.build(params[:category])
                 if request.post? and @category.save
               	  respond_to do |format|
                     format.html do
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :action => 'settings', :tab => 'categories', :id => @project
                     end
                     format.js do
                       # IE doesn't support the replace_html rjs method for select box options
                       render(:update) {|page| page.replace "issue_category_id",
                         content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
                       }
                     end
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   attachments = attach_files(@version, params[:attachments])
                   Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions.sort
               end
               def list_files
                 sort_init "#{Attachment.table_name}.filename", "asc"
                 sort_update
                 @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
                 render :layout => !request.xhr?
               end
               # Show changelog for @project
               def changelog
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
               end
               def roadmap
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
                 @versions = @versions.select {|v| !v.completed? } unless params[:completed]
               end
               def activity
                 @days = Setting.activity_days_default.to_i
                 if params[:from]
                   begin; @date_to = params[:from].to_date; rescue; end
                 end
                 @date_to ||= Date.today + 1
                 @date_from = @date_to - @days
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, :with_subprojects => @with_subprojects)
                 @activity.scope_select {|t| !params["show_#{t}"].nil?}
                 @activity.default_scope! if @activity.scope.empty?
                 events = @activity.events(@date_from, @date_to)
                 respond_to do |format|
                   format.html {
                     @events_by_day = events.group_by(&:event_date)
                     render :layout => false if request.xhr?
                   }
                   format.atom {
                     title = (@activity.scope.size == 1) ? l("label_#{@activity.scope.first.singularize}_plural") : l(:label_activity)
                     render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
                   }
                 end
               end
               def calendar
                 @trackers = @project.rolled_up_trackers
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 events = []
                 @project.issues_with_subprojects(@with_subprojects) do
                   events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                        ) unless @selected_tracker_ids.empty?
                   events += Version.find(:all, :include => :project,
                                                :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                 end
                 @calendar.events = events
                 render :layout => false if request.xhr?
               end
               def gantt
                 @trackers = @project.rolled_up_trackers
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= Date.today.month
                   @year_from ||= Date.today.year
                 end
                 zoom = (params[:zoom] || User.current.pref[:gantt_zoom]).to_i
                 @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
                 months = (params[:months] || User.current.pref[:gantt_months]).to_i
                 @months = (months > 0 && months < 25) ? months : 6
                 # Save gantt paramters as user preference (zoom and months count)
                 if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
                   User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
                   User.current.preference.save
                 end
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 @events = []
                 @project.issues_with_subprojects(@with_subprojects) do
                   # Issues that have start and due dates
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                   # Issues that don't have a due date but that are assigned to a version with a date
                   @events += Issue.find(:all,
                                        :order => "start_date, effective_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version],
                                        :conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                   @events += Version.find(:all, :include => :project,
                                                 :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 end
                 @events.sort! {|x,y| x.start_date <=> y.start_date }
                 if params[:format]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "#{@project.identifier}-gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 elsif params[:format]=='png' && respond_to?('gantt_image')
                   image = gantt_image(@events, @date_from, @months, @zoom)
                   image.format = 'PNG'
                   send_data(image.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png")
                 else
                   render :template => "projects/gantt.rhtml"
                 end
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
             end

app/controllers/queries_controller.rb 0 -1

             # 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 QueriesController < ApplicationController
-              layout 'base'
               menu_item :issues
               before_filter :find_query, :except => :new
               before_filter :find_optional_project, :only => :new
               def new
                 @query = Query.new(params[:query])
                 @query.project = params[:query_is_for_all] ? nil : @project
                 @query.user = User.current
                 @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
                 @query.column_names = nil if params[:default_columns]
                 params[:fields].each do |field|
                   @query.add_filter(field, params[:operators][field], params[:values][field])
                 end if params[:fields]
                 if request.post? && params[:confirm] && @query.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
                   return
                 end
                 render :layout => false if request.xhr?
               end
               def edit
                 if request.post?
                   @query.filters = {}
                   params[:fields].each do |field|
                     @query.add_filter(field, params[:operators][field], params[:values][field])
                   end if params[:fields]
                   @query.attributes = params[:query]
                   @query.project = nil if params[:query_is_for_all]
                   @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
                   @query.column_names = nil if params[:default_columns]
                   if @query.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
                   end
                 end
               end
               def destroy
                 @query.destroy if request.post?
                 redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1
               end
             private
               def find_query
                 @query = Query.find(params[:id])
                 @project = @query.project
                 render_403 unless @query.editable_by?(User.current)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 @project = Project.find(params[:project_id]) if params[:project_id]
                 User.current.allowed_to?(:save_queries, @project, :global => true)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/reports_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 ReportsController < ApplicationController
-              layout 'base'
               menu_item :issues
               before_filter :find_project, :authorize
               def issue_report
                 @statuses = IssueStatus.find(:all, :order => 'position')
                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
                   @rows = @project.trackers
                   @data = issues_by_tracker
                   @report_title = l(:field_tracker)
                   render :template => "reports/issue_report_details"
                 when "version"
                   @field = "fixed_version_id"
                   @rows = @project.versions.sort
                   @data = issues_by_version
                   @report_title = l(:field_version)
                   render :template => "reports/issue_report_details"
                 when "priority"
                   @field = "priority_id"
                   @rows = Enumeration::get_values('IPRI')
                   @data = issues_by_priority
                   @report_title = l(:field_priority)
                   render :template => "reports/issue_report_details"
                 when "category"
                   @field = "category_id"
                   @rows = @project.issue_categories
                   @data = issues_by_category
                   @report_title = l(:field_category)
                   render :template => "reports/issue_report_details"
                 when "assigned_to"
                   @field = "assigned_to_id"
                   @rows = @project.members.collect { |m| m.user }
                   @data = issues_by_assigned_to
                   @report_title = l(:field_assigned_to)
                   render :template => "reports/issue_report_details"
                 when "author"
                   @field = "author_id"
                   @rows = @project.members.collect { |m| m.user }
                   @data = issues_by_author
                   @report_title = l(:field_author)
                   render :template => "reports/issue_report_details"
                 when "subproject"
                   @field = "project_id"
                   @rows = @project.active_children
                   @data = issues_by_subproject
                   @report_title = l(:field_subproject)
                   render :template => "reports/issue_report_details"
                 else
                   @trackers = @project.trackers
                   @versions = @project.versions.sort
                   @priorities = Enumeration::get_values('IPRI')
                   @categories = @project.issue_categories
                   @assignees = @project.members.collect { |m| m.user }
                   @authors = @project.members.collect { |m| m.user }
                   @subprojects = @project.active_children
                   issues_by_tracker
                   issues_by_version
                   issues_by_priority
                   issues_by_category
                   issues_by_assigned_to
                   issues_by_author
                   issues_by_subproject
                   render :template => "reports/issue_report"
                 end
               end
               def delays
                 @trackers = Tracker.find(:all)
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else
                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
                 end
                 @selected_tracker_ids ||= []
                 @raw =
                   ActiveRecord::Base.connection.select_all("SELECT datediff( a.created_on, b.created_on ) as delay, count(a.id) as total
                   FROM issue_histories a, issue_histories b, issues i
                   WHERE a.status_id =5
                   AND a.issue_id = b.issue_id
                   AND a.issue_id = i.id
                   AND i.tracker_id in (#{@selected_tracker_ids.join(',')})
                   AND b.id = (
                   SELECT min( c.id )
                   FROM issue_histories c
                   WHERE b.issue_id = c.issue_id )
                   GROUP BY delay") unless @selected_tracker_ids.empty?
                 @raw ||=[]
                 @x_from = 0
                 @x_to = 0
                 @y_from = 0
                 @y_to = 0
                 @sum_total = 0
                 @sum_delay = 0
                 @raw.each do |r|
                   @x_to = [r['delay'].to_i, @x_to].max
                   @y_to = [r['total'].to_i, @y_to].max
                   @sum_total = @sum_total + r['total'].to_i
                   @sum_delay = @sum_delay + r['total'].to_i * r['delay'].to_i
                 end
               end
             private
               # Find project of id params[:id]
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def issues_by_tracker
                 @issues_by_tracker ||=
                     ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               t.id as tracker_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Tracker.table_name} t
                                                             where
                                                               i.status_id=s.id
                                                               and i.tracker_id=t.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, t.id")
               end
               def issues_by_version
                 @issues_by_version ||=
                     ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               v.id as fixed_version_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Version.table_name} v
                                                             where
                                                               i.status_id=s.id
                                                               and i.fixed_version_id=v.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, v.id")
               end
               def issues_by_priority
                 @issues_by_priority ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               p.id as priority_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Enumeration.table_name} p
                                                             where
                                                               i.status_id=s.id
                                                               and i.priority_id=p.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, p.id")
               end
               def issues_by_category
                 @issues_by_category ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               c.id as category_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{IssueCategory.table_name} c
                                                             where
                                                               i.status_id=s.id
                                                               and i.category_id=c.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, c.id")
               end
               def issues_by_assigned_to
                 @issues_by_assigned_to ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               a.id as assigned_to_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{User.table_name} a
                                                             where
                                                               i.status_id=s.id
                                                               and i.assigned_to_id=a.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, a.id")
               end
               def issues_by_author
                 @issues_by_author ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               a.id as author_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{User.table_name} a
                                                             where
                                                               i.status_id=s.id
                                                               and i.author_id=a.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, a.id")
               end
               def issues_by_subproject
                 @issues_by_subproject ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               i.project_id as project_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s
                                                             where
                                                               i.status_id=s.id
                                                               and i.project_id IN (#{@project.active_children.collect{|p| p.id}.join(',')})
                                                             group by s.id, s.is_closed, i.project_id") if @project.active_children.any?
                 @issues_by_subproject ||= []
               end
             end

app/controllers/repositories_controller.rb 0 -1

             # 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.
             require 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             require 'digest/sha1'
             class ChangesetNotFound < Exception; end
             class InvalidRevisionParam < Exception; end
             class RepositoriesController < ApplicationController
-              layout 'base'
               menu_item :repository
               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize
               accept_key_auth :revisions
               rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
               def edit
                 @repository = @project.repository
                 if !@repository
                   @repository = Repository.factory(params[:repository_scm])
                   @repository.project = @project if @repository
                 end
                 if request.post? && @repository
                   @repository.attributes = params[:repository]
                   @repository.save
                 end
                 render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
               end
               def destroy
                 @repository.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
               end
               def show
                 # check if new revisions have been committed in the repository
                 @repository.fetch_changesets if Setting.autofetch_changesets?
                 # root entries
                 @entries = @repository.entries('', @rev)
                 # latest changesets
                 @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
                 show_error_not_found unless @entries || @changesets.any?
               end
               def browse
                 @entries = @repository.entries(@path, @rev)
                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
                   show_error_not_found and return unless @entries
                   @properties = @repository.properties(@path, @rev)
                   render :action => 'browse'
                 end
               end
               def changes
                 @entry = @repository.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 @changesets = @repository.changesets_for_path(@path)
                 @properties = @repository.properties(@path, @rev)
               end
               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
             								      per_page_option,
             								      params['page']
                 @changesets = @repository.changesets.find(:all,
             						:limit  =>  @changeset_pages.items_per_page,
             						:offset =>  @changeset_pages.current.offset)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                 end
               end
               def entry
                 @entry = @repository.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 # If the entry is a dir, show the browser
                 browse and return if @entry.is_dir?
                 @content = @repository.cat(@path, @rev)
                 show_error_not_found and return unless @content
                 if 'raw' == params[:format] || @content.is_binary_data?
                   # Force the download if it's a binary file
                   send_data @content, :filename => @path.split('/').last
                 else
                   # Prevent empty lines when displaying a file with Windows style eol
                   @content.gsub!("\r\n", "\n")
                end
               end
               def annotate
                 @annotate = @repository.scm.annotate(@path, @rev)
                 render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
               end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 raise ChangesetNotFound unless @changeset
                 @changes_count = @changeset.changes.size
                 @changes_pages = Paginator.new self, @changes_count, 150, params['page']
                 @changes = @changeset.changes.find(:all,
               						:limit  =>  @changes_pages.items_per_page,
               						:offset =>  @changes_pages.current.offset)
                 respond_to do |format|
                   format.html
                   format.js {render :layout => false}
                 end
               rescue ChangesetNotFound
                 show_error_not_found
               end
               def diff
                 if params[:format] == 'diff'
                   @diff = @repository.diff(@path, @rev, @rev_to)
                   show_error_not_found and return unless @diff
                   filename = "changeset_r#{@rev}"
                   filename << "_r#{@rev_to}" if @rev_to
                   send_data @diff.join, :filename => "#{filename}.diff",
                                         :type => 'text/x-patch',
                                         :disposition => 'attachment'
                 else
                   @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                   @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                   # Save diff type as user preference
                   if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                     User.current.pref[:diff_type] = @diff_type
                     User.current.preference.save
                   end
                   @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                   unless read_fragment(@cache_key)
                     @diff = @repository.diff(@path, @rev, @rev_to)
                     show_error_not_found unless @diff
                   end
                 end
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               REV_PARAM_RE = %r{^[a-f0-9]*$}
               def find_repository
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 render_404 and return false unless @repository
                 @path = params[:path].join('/') unless params[:path].nil?
                 @path ||= ''
                 @rev = params[:rev]
                 @rev_to = params[:rev_to]
                 raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
               rescue ActiveRecord::RecordNotFound
                 render_404
               rescue InvalidRevisionParam
                 show_error_not_found
               end
               def show_error_not_found
                 render_error l(:error_scm_not_found)
               end
               # Handler for Redmine::Scm::Adapters::CommandFailed exception
               def show_error_command_failed(exception)
                 render_error l(:error_scm_command_failed, exception.message)
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 11
                 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
                 month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
 .times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 800,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 # Remove email adress in usernames
                 fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 400,
                   :width => 800,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
             end
             class String
               def with_leading_slash
                 starts_with?('/') ? self : "/#{self}"
               end
             end

app/controllers/roles_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 RolesController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               verify :method => :post, :only => [ :destroy, :move ],
                      :redirect_to => { :action => :list }
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 # Prefills the form with 'Non member' role permissions
                 @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
                 if request.post? && @role.save
                   # workflow copy
                   if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
                     @role.workflows.copy(copy_from)
                   end
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
                 @permissions = @role.setable_permissions
                 @roles = Role.find :all, :order => 'builtin, position'
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @permissions = @role.setable_permissions
               end
               def destroy
                 @role = Role.find(params[:id])
                 @role.destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:error] = 'This role is in use and can not be deleted.'
                 redirect_to :action => 'index'
               end
               def move
                 @role = Role.find(params[:id])
                 case params[:position]
                 when 'highest'
                   @role.move_to_top
                 when 'higher'
                   @role.move_higher
                 when 'lower'
                   @role.move_lower
                 when 'lowest'
                   @role.move_to_bottom
                 end if params[:position]
                 redirect_to :action => 'list'
               end
               def workflow
                 @role = Role.find_by_id(params[:role_id])
                 @tracker = Tracker.find_by_id(params[:tracker_id])
                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |old, news|
                     news.each { |new|
                       @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
                     }
                   }
                   if @role.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'workflow', :role_id => @role, :tracker_id => @tracker
                   end
                 end
                 @roles = Role.find(:all, :order => 'builtin, position')
                 @trackers = Tracker.find(:all, :order => 'position')
                 @statuses = IssueStatus.find(:all, :order => 'position')
               end
               def report
                 @roles = Role.find(:all, :order => 'builtin, position')
                 @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
                 if request.post?
                   @roles.each do |role|
                     role.permissions = params[:permissions][role.id.to_s]
                     role.save
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
               end
             end

app/controllers/search_controller.rb 0 -2

             # redMine - project management software
             # Copyright (C) 2006  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 SearchController < ApplicationController
-              layout 'base'
               before_filter :find_optional_project
               helper :messages
               include MessagesHelper
               def index
                 @question = params[:q] || ""
                 @question.strip!
                 @all_words = params[:all_words] || (params[:submit] ? false : true)
                 @titles_only = !params[:titles_only].nil?
                 projects_to_search =
                   case params[:scope]
                   when 'all'
                     nil
                   when 'my_projects'
                     User.current.memberships.collect(&:project)
                   when 'subprojects'
                     @project ? ([ @project ] + @project.active_children) : nil
                   else
                     @project
                   end
                 offset = nil
                 begin; offset = params[:offset].to_time if params[:offset]; rescue; end
                 # quick jump to an issue
                 if @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(User.current))
                   redirect_to :controller => "issues", :action => "show", :id => $1
                   return
                 end
                 @object_types = %w(issues news documents changesets wiki_pages messages projects)
                 if projects_to_search.is_a? Project
                   # don't search projects
                   @object_types.delete('projects')
                   # only show what the user is allowed to view
                   @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, projects_to_search)}
                 end
                 @scope = @object_types.select {|t| params[t]}
                 @scope = @object_types if @scope.empty?
                 # extract tokens from the question
                 # eg. hello "bye bye" => ["hello", "bye bye"]
                 @tokens = @question.scan(%r{((\s|^)"[\s\w]+"(\s|$)|\S+)}).collect {|m| m.first.gsub(%r{(^\s*"\s*|\s*"\s*$)}, '')}
                 # tokens must be at least 3 character long
                 @tokens = @tokens.uniq.select {|w| w.length > 2 }
                 if !@tokens.empty?
                   # no more than 5 tokens to search for
                   @tokens.slice! 5..-1 if @tokens.size > 5
                   # strings used in sql like statement
                   like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}
                   @results = []
                   @results_by_type = Hash.new {|h,k| h[k] = 0}
                   limit = 10
                   @scope.each do |s|
                     r, c = s.singularize.camelcase.constantize.search(like_tokens, projects_to_search,
                       :all_words => @all_words,
                       :titles_only => @titles_only,
                       :limit => (limit+1),
                       :offset => offset,
                       :before => params[:previous].nil?)
                     @results += r
                     @results_by_type[s] += c
                   end
                   @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
                   if params[:previous].nil?
                     @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
                     if @results.size > limit
                       @pagination_next_date = @results[limit-1].event_datetime
                       @results = @results[0, limit]
                     end
                   else
                     @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
                     if @results.size > limit
                       @pagination_previous_date = @results[-(limit)].event_datetime
                       @results = @results[-(limit), limit]
                     end
                   end
                 else
                   @question = ""
                 end
                 render :layout => false if request.xhr?
               end
             private
               def find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 check_project_privacy
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/settings_controller.rb 0 -1

             # 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 SettingsController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               def index
                 edit
                 render :action => 'edit'
               end
               def edit
                 @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted)
                 if request.post? && params[:settings] && params[:settings].is_a?(Hash)
                   settings = (params[:settings] || {}).dup.symbolize_keys
                   settings.each do |name, value|
                     # remove blank values in array settings
                     value.delete_if {|v| v.blank? } if value.is_a?(Array)
                     Setting[name] = value
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'edit', :tab => params[:tab]
                   return
                 end
                 @options = {}
                 @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
                 @deliveries = ActionMailer::Base.perform_deliveries
               end
               def plugin
                 plugin_id = params[:id].to_sym
                 @plugin = Redmine::Plugin.registered_plugins[plugin_id]
                 if request.post?
                   Setting["plugin_#{plugin_id}"] = params[:settings]
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'plugin', :id => params[:id]
                 end
                 @partial = @plugin.settings[:partial]
                 @settings = Setting["plugin_#{plugin_id}"]
               end
             end

app/controllers/timelog_controller.rb 0 -1

             # 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 TimelogController < ApplicationController
-              layout 'base'
               menu_item :issues
               before_filter :find_project, :authorize
               verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
               helper :sort
               include SortHelper
               helper :issues
               include TimelogHelper
               helper :custom_fields
               include CustomFieldsHelper
               def report
                 @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
                                                       :klass => Project,
                                                       :label => :label_project},
                                          'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
                                                       :klass => Version,
                                                       :label => :label_version},
                                          'category' => {:sql => "#{Issue.table_name}.category_id",
                                                         :klass => IssueCategory,
                                                         :label => :field_category},
                                          'member' => {:sql => "#{TimeEntry.table_name}.user_id",
                                                      :klass => User,
                                                      :label => :label_member},
                                          'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
                                                       :klass => Tracker,
                                                       :label => :label_tracker},
                                          'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
                                                        :klass => Enumeration,
                                                        :label => :label_activity},
                                          'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
                                                      :klass => Issue,
                                                      :label => :label_issue}
                                        }
                 # Add list and boolean custom fields as available criterias
                 @project.all_issue_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
                   @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
                                                          :format => cf.field_format,
                                                          :label => cf.name}
                 end
                 # Add list and boolean time entry custom fields
                 TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
                   @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = #{TimeEntry.table_name}.id)",
                                                          :format => cf.field_format,
                                                          :label => cf.name}
                 end
                 @criterias = params[:criterias] || []
                 @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
                 @criterias.uniq!
                 @criterias = @criterias[0,3]
                 @columns = (params[:columns] && %w(year month week day).include?(params[:columns])) ? params[:columns] : 'month'
                 retrieve_date_range
                 unless @criterias.empty?
                   sql_select = @criterias.collect{|criteria| @available_criterias[criteria][:sql] + " AS " + criteria}.join(', ')
                   sql_group_by = @criterias.collect{|criteria| @available_criterias[criteria][:sql]}.join(', ')
                   sql = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
                   sql << " FROM #{TimeEntry.table_name}"
                   sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
                   sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
                   sql << " WHERE (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
                   sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
                   sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
                   sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
                   @hours = ActiveRecord::Base.connection.select_all(sql)
                   @hours.each do |row|
                     case @columns
                     when 'year'
                       row['year'] = row['tyear']
                     when 'month'
                       row['month'] = "#{row['tyear']}-#{row['tmonth']}"
                     when 'week'
                       row['week'] = "#{row['tyear']}-#{row['tweek']}"
                     when 'day'
                       row['day'] = "#{row['spent_on']}"
                     end
                   end
                   @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
                   @periods = []
                   # Date#at_beginning_of_ not supported in Rails 1.2.x
                   date_from = @from.to_time
                   # 100 columns max
                   while date_from <= @to.to_time && @periods.length < 100
                     case @columns
                     when 'year'
                       @periods << "#{date_from.year}"
                       date_from = (date_from + 1.year).at_beginning_of_year
                     when 'month'
                       @periods << "#{date_from.year}-#{date_from.month}"
                       date_from = (date_from + 1.month).at_beginning_of_month
                     when 'week'
                       @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
                       date_from = (date_from + 7.day).at_beginning_of_week
                     when 'day'
                       @periods << "#{date_from.to_date}"
                       date_from = date_from + 1.day
                     end
                   end
                 end
                 respond_to do |format|
                   format.html { render :layout => !request.xhr? }
                   format.csv  { send_data(report_to_csv(@criterias, @periods, @hours).read, :type => 'text/csv; header=present', :filename => 'timelog.csv') }
                 end
               end
               def details
                 sort_init 'spent_on', 'desc'
                 sort_update
                 cond = ARCondition.new
                 cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
                                        ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
                 retrieve_date_range
                 cond << ['spent_on BETWEEN ? AND ?', @from, @to]
                 TimeEntry.visible_by(User.current) do
                   respond_to do |format|
                     format.html {
                       # Paginate results
                       @entry_count = TimeEntry.count(:include => :project, :conditions => cond.conditions)
                       @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
                       @entries = TimeEntry.find(:all,
                                                 :include => [:project, :activity, :user, {:issue => :tracker}],
                                                 :conditions => cond.conditions,
                                                 :order => sort_clause,
                                                 :limit  =>  @entry_pages.items_per_page,
                                                 :offset =>  @entry_pages.current.offset)
                       @total_hours = TimeEntry.sum(:hours, :include => :project, :conditions => cond.conditions).to_f
                       render :layout => !request.xhr?
                     }
                     format.atom {
                       entries = TimeEntry.find(:all,
                                                :include => [:project, :activity, :user, {:issue => :tracker}],
                                                :conditions => cond.conditions,
                                                :order => "#{TimeEntry.table_name}.created_on DESC",
                                                :limit => Setting.feeds_limit.to_i)
                       render_feed(entries, :title => l(:label_spent_time))
                     }
                     format.csv {
                       # Export all entries
                       @entries = TimeEntry.find(:all,
                                                 :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
                                                 :conditions => cond.conditions,
                                                 :order => sort_clause)
                       send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
                     }
                   end
                 end
               end
               def edit
                 render_403 and return if @time_entry && !@time_entry.editable_by?(User.current)
                 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                 @time_entry.attributes = params[:time_entry]
                 if request.post? and @time_entry.save
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to(params[:back_url].blank? ? {:action => 'details', :project_id => @time_entry.project} : params[:back_url])
                   return
                 end
               end
               def destroy
                 render_404 and return unless @time_entry
                 render_403 and return unless @time_entry.editable_by?(User.current)
                 @time_entry.destroy
                 flash[:notice] = l(:notice_successful_delete)
                 redirect_to :back
               rescue RedirectBackError
                 redirect_to :action => 'details', :project_id => @time_entry.project
               end
             private
               def find_project
                 if params[:id]
                   @time_entry = TimeEntry.find(params[:id])
                   @project = @time_entry.project
                 elsif params[:issue_id]
                   @issue = Issue.find(params[:issue_id])
                   @project = @issue.project
                 elsif params[:project_id]
                   @project = Project.find(params[:project_id])
                 else
                   render_404
                   return false
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Retrieves the date range based on predefined ranges or specific from/to param dates
               def retrieve_date_range
                 @free_period = false
                 @from, @to = nil, nil
                 if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
                   case params[:period].to_s
                   when 'today'
                     @from = @to = Date.today
                   when 'yesterday'
                     @from = @to = Date.today - 1
                   when 'current_week'
                     @from = Date.today - (Date.today.cwday - 1)%7
                     @to = @from + 6
                   when 'last_week'
                     @from = Date.today - 7 - (Date.today.cwday - 1)%7
                     @to = @from + 6
                   when '7_days'
                     @from = Date.today - 7
                     @to = Date.today
                   when 'current_month'
                     @from = Date.civil(Date.today.year, Date.today.month, 1)
                     @to = (@from >> 1) - 1
                   when 'last_month'
                     @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
                     @to = (@from >> 1) - 1
                   when '30_days'
                     @from = Date.today - 30
                     @to = Date.today
                   when 'current_year'
                     @from = Date.civil(Date.today.year, 1, 1)
                     @to = Date.civil(Date.today.year, 12, 31)
                   end
                 elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
                   begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
                   begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
                   @free_period = true
                 else
                   # default
                 end
                 @from, @to = @to, @from if @from && @to && @from > @to
                 @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today) - 1
                 @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today)
               end
             end

app/controllers/trackers_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 TrackersController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy, :move ], :redirect_to => { :action => :list }
               def list
                 @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @tracker = Tracker.new(params[:tracker])
                 if request.post? and @tracker.save
                   # workflow copy
                   if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
                     @tracker.workflows.copy(copy_from)
                   end
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
                 @trackers = Tracker.find :all, :order => 'position'
               end
               def edit
                 @tracker = Tracker.find(params[:id])
                 if request.post? and @tracker.update_attributes(params[:tracker])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
               end
               def move
                 @tracker = Tracker.find(params[:id])
                 case params[:position]
                 when 'highest'
                   @tracker.move_to_top
                 when 'higher'
                   @tracker.move_higher
                 when 'lower'
                   @tracker.move_lower
                 when 'lowest'
                   @tracker.move_to_bottom
                 end if params[:position]
                 redirect_to :action => 'list'
               end
               def destroy
                 @tracker = Tracker.find(params[:id])
                 unless @tracker.issues.empty?
                   flash[:error] = "This tracker contains issues and can\'t be deleted."
                 else
                   @tracker.destroy
                 end
                 redirect_to :action => 'list'
               end
             end

app/controllers/users_controller.rb 0 -1

             # 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 UsersController < ApplicationController
-              layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 sort_init 'login', 'asc'
                 sort_update
                 @status = params[:status] ? params[:status].to_i : 1
                 conditions = "status <> 0"
                 conditions = ["status=?", @status] unless @status == 0
                 @user_count = User.count(:conditions => conditions)
                 @user_pages = Paginator.new self, @user_count,
             								per_page_option,
             								params['page']
                 @users =  User.find :all,:order => sort_clause,
                                     :conditions => conditions,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               def add
                 if request.get?
                   @user = User.new(:language => Setting.default_language)
                 else
                   @user = User.new(params[:user])
                   @user.admin = params[:user][:admin] || false
                   @user.login = params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
                   if @user.save
                     Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
               end
               def edit
                 @user = User.find(params[:id])
                 if request.post?
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
                   if @user.update_attributes(params[:user])
                     flash[:notice] = l(:notice_successful_update)
                     # Give a string to redirect_to otherwise it would use status param as the response code
                     redirect_to(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
                 @roles = Role.find_all_givable
                 @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
                 @membership ||= Member.new
                 @memberships = @user.memberships
               end
               def edit_membership
                 @user = User.find(params[:id])
                 @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
                 @membership.attributes = params[:membership]
                 @membership.save if request.post?
                 redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
               end
               def destroy_membership
                 @user = User.find(params[:id])
                 Member.find(params[:membership_id]).destroy if request.post?
                 redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
               end
             end

app/controllers/versions_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 VersionsController < ApplicationController
-              layout 'base'
               menu_item :roadmap
               before_filter :find_project, :authorize
               def show
               end
               def edit
                 if request.post? and @version.update_attributes(params[:version])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                 end
               end
               def destroy
                 @version.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
               rescue
                 flash[:error] = "Unable to delete version"
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
               end
               def destroy_file
                 @version.attachments.find(params[:attachment_id]).destroy
                 flash[:notice] = l(:notice_successful_delete)
                 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
               end
               def status_by
                 respond_to do |format|
                   format.html { render :action => 'show' }
                   format.js { render(:update) {|page| page.replace_html 'status_by', render_issue_status_by(@version, params[:status_by])} }
                 end
               end
             private
               def find_project
                 @version = Version.find(params[:id])
                 @project = @version.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/watchers_controller.rb 0 -1

             # 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 WatchersController < ApplicationController
-              layout 'base'
               before_filter :find_project
               before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
               before_filter :authorize, :only => :new
               verify :method => :post,
                      :only => [ :watch, :unwatch ],
                      :render => { :nothing => true, :status => :method_not_allowed }
               def watch
                 set_watcher(User.current, true)
               end
               def unwatch
                 set_watcher(User.current, false)
               end
               def new
                 @watcher = Watcher.new(params[:watcher])
                 @watcher.watchable = @watched
                 @watcher.save if request.post?
                 respond_to do |format|
                   format.html { redirect_to :back }
                   format.js do
                     render :update do |page|
                       page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
                     end
                   end
                 end
               rescue ::ActionController::RedirectBackError
                 render :text => 'Watcher added.', :layout => true
               end
             private
               def find_project
                 klass = Object.const_get(params[:object_type].camelcase)
                 return false unless klass.respond_to?('watched_by')
                 @watched = klass.find(params[:object_id])
                 @project = @watched.project
               rescue
                 render_404
               end
               def set_watcher(user, watching)
                 @watched.set_watcher(user, watching)
                 respond_to do |format|
                   format.html { redirect_to :back }
                   format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
                 end
               rescue ::ActionController::RedirectBackError
                 render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true
               end
             end

app/controllers/welcome_controller.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  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 WelcomeController < ApplicationController
-              layout 'base'
               def index
                 @news = News.latest User.current
                 @projects = Project.latest User.current
               end
             end

app/controllers/wiki_controller.rb 0 -1

             # 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.
             require 'diff'
             class WikiController < ApplicationController
-              layout 'base'
               before_filter :find_wiki, :authorize
               verify :method => :post, :only => [:destroy, :destroy_attachment, :protect], :redirect_to => { :action => :index }
               helper :attachments
               include AttachmentsHelper
               # display a page (in editing mode if it doesn't exist)
               def index
                 page_title = params[:page]
                 @page = @wiki.find_or_new_page(page_title)
                 if @page.new_record?
                   if User.current.allowed_to?(:edit_wiki_pages, @project)
                     edit
                     render :action => 'edit'
                   else
                     render_404
                   end
                   return
                 end
                 @content = @page.content_for_version(params[:version])
                 if params[:export] == 'html'
                   export = render_to_string :action => 'export', :layout => false
                   send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
                   return
                 elsif params[:export] == 'txt'
                   send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
                   return
                 end
             	@editable = editable?
                 render :action => 'show'
               end
               # edit an existing page or a new one
               def edit
                 @page = @wiki.find_or_new_page(params[:page])
                 return render_403 unless editable?
                 @page.content = WikiContent.new(:page => @page) if @page.new_record?
                 @content = @page.content_for_version(params[:version])
                 @content.text = "h1. #{@page.pretty_title}" if @content.text.blank?
                 # don't keep previous comment
                 @content.comments = nil
                 if request.post?
                   if !@page.new_record? && @content.text == params[:content][:text]
                     # don't save if text wasn't changed
                     redirect_to :action => 'index', :id => @project, :page => @page.title
                     return
                   end
                   #@content.text = params[:content][:text]
                   #@content.comments = params[:content][:comments]
                   @content.attributes = params[:content]
                   @content.author = User.current
                   # if page is new @page.save will also save content, but not if page isn't a new record
                   if (@page.new_record? ? @page.save : @content.save)
                     redirect_to :action => 'index', :id => @project, :page => @page.title
                   end
                 end
               rescue ActiveRecord::StaleObjectError
                 # Optimistic locking exception
                 flash[:error] = l(:notice_locking_conflict)
               end
               # rename a page
               def rename
                 @page = @wiki.find_page(params[:page])
             	return render_403 unless editable?
                 @page.redirect_existing_links = true
                 # used to display the *original* title if some AR validation errors occur
                 @original_title = @page.pretty_title
                 if request.post? && @page.update_attributes(params[:wiki_page])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'index', :id => @project, :page => @page.title
                 end
               end
               def protect
                 page = @wiki.find_page(params[:page])
                 page.update_attribute :protected, params[:protected]
                 redirect_to :action => 'index', :id => @project, :page => page.title
               end
               # show page history
               def history
                 @page = @wiki.find_page(params[:page])
                 @version_count = @page.content.versions.count
                 @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
                 # don't load text
                 @versions = @page.content.versions.find :all,
                                                         :select => "id, author_id, comments, updated_on, version",
                                                         :order => 'version DESC',
                                                         :limit  =>  @version_pages.items_per_page + 1,
                                                         :offset =>  @version_pages.current.offset
                 render :layout => false if request.xhr?
               end
               def diff
                 @page = @wiki.find_page(params[:page])
                 @diff = @page.diff(params[:version], params[:version_from])
                 render_404 unless @diff
               end
               def annotate
                 @page = @wiki.find_page(params[:page])
                 @annotate = @page.annotate(params[:version])
               end
               # remove a wiki page and its history
               def destroy
                 @page = @wiki.find_page(params[:page])
             	return render_403 unless editable?
                 @page.destroy if @page
                 redirect_to :action => 'special', :id => @project, :page => 'Page_index'
               end
               # display special pages
               def special
                 page_title = params[:page].downcase
                 case page_title
                 # show pages index, sorted by title
                 when 'page_index', 'date_index'
                   # eager load information about last updates, without loading text
                   @pages = @wiki.pages.find :all, :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
                                                   :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
                                                   :order => 'title'
                   @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
                   @pages_by_parent_id = @pages.group_by(&:parent_id)
                 # export wiki to a single html file
                 when 'export'
                   @pages = @wiki.pages.find :all, :order => 'title'
                   export = render_to_string :action => 'export_multiple', :layout => false
                   send_data(export, :type => 'text/html', :filename => "wiki.html")
                   return
                 else
                   # requested special page doesn't exist, redirect to default page
                   redirect_to :action => 'index', :id => @project, :page => nil and return
                 end
                 render :action => "special_#{page_title}"
               end
               def preview
                 page = @wiki.find_page(params[:page])
                 # page is nil when previewing a new page
                 return render_403 unless page.nil? || editable?(page)
                 if page
                   @attachements = page.attachments
                   @previewed = page.content
                 end
                 @text = params[:content][:text]
                 render :partial => 'common/preview'
               end
               def add_attachment
                 @page = @wiki.find_page(params[:page])
                 return render_403 unless editable?
                 attach_files(@page, params[:attachments])
                 redirect_to :action => 'index', :page => @page.title
               end
               def destroy_attachment
                 @page = @wiki.find_page(params[:page])
                 return render_403 unless editable?
                 @page.attachments.find(params[:attachment_id]).destroy
                 redirect_to :action => 'index', :page => @page.title
               end
             private
               def find_wiki
                 @project = Project.find(params[:id])
                 @wiki = @project.wiki
                 render_404 unless @wiki
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Returns true if the current user is allowed to edit the page, otherwise false
               def editable?(page = @page)
                 page.editable_by?(User.current)
               end
             end

app/controllers/wikis_controller.rb 0 -1

             # 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 WikisController < ApplicationController
-              layout 'base'
               menu_item :settings
               before_filter :find_project, :authorize
               # Create or update a project's wiki
               def edit
                 @wiki = @project.wiki || Wiki.new(:project => @project)
                 @wiki.attributes = params[:wiki]
                 @wiki.save if request.post?
                 render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'}
               end
               # Delete a project's wiki
               def destroy
                 if request.post? && params[:confirm] && @project.wiki
                   @project.wiki.destroy
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'wiki'
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             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