Added test coverage for Redmine::Plugin.add_hook

Conflicts:

	lib/redmine/plugin.rb

.gitignore

@@ -1,34 +0,0 @@
-/.project
-/.loadpath
-/config/additional_environment.rb
-/config/configuration.yml
-/config/database.yml
-/config/email.yml
-/config/initializers/session_store.rb
-/config/initializers/secret_token.rb
-/coverage
-/db/*.db
-/db/*.sqlite3
-/db/schema.rb
-/files/*
-/lib/redmine/scm/adapters/mercurial/redminehelper.pyc
-/lib/redmine/scm/adapters/mercurial/redminehelper.pyo
-/log/*.log*
-/log/mongrel_debug
-/public/dispatch.*
-/public/plugin_assets
-/tmp/*
-/tmp/cache/*
-/tmp/pdf/*
-/tmp/sessions/*
-/tmp/sockets/*
-/tmp/test/*
-/tmp/thumbnails/*
-/vendor/cache
-/vendor/rails
-*.rbc
-
-/.bundle
-/Gemfile.lock
-/Gemfile.local
-

.hgignore

@@ -1,39 +0,0 @@
-syntax: glob
-
-.project
-.loadpath
-config/additional_environment.rb
-config/configuration.yml
-config/database.yml
-config/email.yml
-config/initializers/session_store.rb
-config/initializers/secret_token.rb
-coverage
-db/*.db
-db/*.sqlite3
-db/schema.rb
-files/*
-lib/redmine/scm/adapters/mercurial/redminehelper.pyc
-lib/redmine/scm/adapters/mercurial/redminehelper.pyo
-log/*.log*
-log/mongrel_debug
-public/dispatch.*
-public/plugin_assets
-tmp/*
-tmp/cache/*
-tmp/pdf/*
-tmp/sessions/*
-tmp/sockets/*
-tmp/test/*
-tmp/thumbnails/*
-vendor/cache
-vendor/rails
-*.rbc
-
-.svn/
-.git/
-
-.bundle
-Gemfile.lock
-Gemfile.local
-

Gemfile

@@ -1,95 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', '3.2.11'
-gem "jquery-rails", "~> 2.0.2"
-gem "i18n", "~> 0.6.0"
-gem "coderay", "~> 1.0.6"
-gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
-gem "builder", "3.0.0"
-
-# Optional gem for LDAP authentication
-group :ldap do
-  gem "net-ldap", "~> 0.3.1"
-end
-
-# Optional gem for OpenID authentication
-group :openid do
-  gem "ruby-openid", "~> 2.1.4", :require => "openid"
-  gem "rack-openid"
-end
-
-# Optional gem for exporting the gantt to a PNG file, not supported with jruby
-platforms :mri, :mingw do
-  group :rmagick do
-    # RMagick 2 supports ruby 1.9
-    # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
-    # different requirements for the same gem on different platforms
-    gem "rmagick", ">= 2.0.0"
-  end
-end
-
-# Database gems
-platforms :mri, :mingw do
-  group :postgresql do
-    gem "pg", ">= 0.11.0"
-  end
-
-  group :sqlite do
-    gem "sqlite3"
-  end
-end
-
-platforms :mri_18, :mingw_18 do
-  group :mysql do
-    gem "mysql", "~> 2.8.1"
-  end
-end
-
-platforms :mri_19, :mingw_19 do
-  group :mysql do
-    gem "mysql2", "~> 0.3.11"
-  end
-end
-
-platforms :jruby do
-  gem "jruby-openssl"
-
-  group :mysql do
-    gem "activerecord-jdbcmysql-adapter"
-  end
-
-  group :postgresql do
-    gem "activerecord-jdbcpostgresql-adapter"
-  end
-
-  group :sqlite do
-    gem "activerecord-jdbcsqlite3-adapter"
-  end
-end
-
-group :development do
-  gem "rdoc", ">= 2.4.2"
-  gem "yard"
-end
-
-group :test do
-  gem "shoulda", "~> 2.11"
-  # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7.
-  # It seems to need test-unit explicitely.
-  platforms = [:mri_19]
-  platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7"
-  gem "test-unit", :platforms => platforms
-  gem "mocha", "0.12.3"
-end
-
-local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
-if File.exists?(local_gemfile)
-  puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(local_gemfile)
-end
-
-# Load plugins' Gemfiles
-Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
-end

README.rdoc

@@ -1,5 +0,0 @@
-= Redmine
-
-Redmine is a flexible project management web application written using Ruby on Rails framework.
-
-More details can be found in the doc directory or on the official website http://www.redmine.org

Rakefile

@@ -1,7 +1,10 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+# for example lib/tasks/switchtower.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
-RedmineApp::Application.load_tasks
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'

app/apis/sys_api.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -15,8 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-class DocumentObserver < ActiveRecord::Observer
+class SysApi < ActionWebService::API::Base
-  def after_create(document)
+  api_method :projects,
-    Mailer.document_added(document).deliver if Setting.notified_events.include?('document_added')
+             :expects => [],
-  end
+             :returns => [[Project]]
+  api_method :repository_created,
+             :expects => [:string, :string],
+             :returns => [:int]
 end

app/controllers/account_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,50 +16,76 @@
 # 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
+  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
+      # Logout user
+      self.logged_user = nil
     else
-      authenticate_user
+      # 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
-  rescue AuthSourceException => e
-    logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
-    render_error :message => e.message
   end
 
   # Log out current user and redirect to welcome page
   def logout
-    logout_user
+    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
   
-  # Lets user choose a new password
+  # 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].to_s)
+      @token = Token.find_by_action_and_value("recovery", params[:token])
-      if @token.nil? || @token.expired?
+      redirect_to(home_url) && return unless @token and !@token.expired?
-        redirect_to home_url
-        return
-      end
       @user = @token.user
-      unless @user && @user.active?
-        redirect_to home_url
-        return
-      end
       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 signin_path
+          redirect_to :action => 'login'
           return
         end 
       end
@@ -67,23 +93,17 @@ class AccountController < ApplicationController
       return
     else
       if request.post?
-        user = User.find_by_mail(params[:mail].to_s)
+        user = User.find_by_mail(params[:mail])
-        # user not found or not active
+        # user not found in db
-        unless user && user.active?
+        flash.now[:error] = l(:notice_account_unknown_email) and return unless user
-          flash.now[:error] = l(:notice_account_unknown_email)
+        # user uses an external authentification
-          return
+        flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id
-        end
-        # user cannot change its password
-        unless user.change_password_allowed?
-          flash.now[:error] = l(:notice_can_t_change_password)
-          return
-        end
         # create a new token for password recovery
         token = Token.new(:user => user, :action => "recovery")
         if token.save
-          Mailer.lost_password(token).deliver
+          Mailer.deliver_lost_password(token)
           flash[:notice] = l(:notice_account_lost_email_sent)
-          redirect_to signin_path
+          redirect_to :action => 'login'
           return
         end
       end
@@ -97,13 +117,11 @@ class AccountController < ApplicationController
       session[:auth_source_registration] = nil
       @user = User.new(:language => Setting.default_language)
     else
-      user_params = params[:user] || {}
+      @user = User.new(params[:user])
-      @user = User.new
-      @user.safe_attributes = user_params
       @user.admin = false
-      @user.register
+      @user.status = User::STATUS_REGISTERED
       if session[:auth_source_registration]
-        @user.activate
+        @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
@@ -114,17 +132,32 @@ class AccountController < ApplicationController
         end
       else
         @user.login = params[:user][:login]
-        unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
+        @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
-          @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
-        end
-
         case Setting.self_registration
         when '1'
-          register_by_email_activation(@user)
+          # 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'
-          register_automatically(@user)
+          # 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
-          register_manually_by_administrator(@user)
+          # 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
@@ -136,161 +169,23 @@ class AccountController < ApplicationController
     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.registered?
+    redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
-    user.activate
+    user.status = User::STATUS_ACTIVE
     if user.save
       token.destroy
       flash[:notice] = l(:notice_account_activated)
     end
-    redirect_to signin_path
+    redirect_to :action => 'login'
   end
   
-  private
+private
-
+  def logged_user=(user)
-  def authenticate_user
+    if user && user.is_a?(User)
-    if Setting.openid? && using_open_id?
+      User.current = user
-      open_id_authenticate(params[:openid_url])
+      session[:user_id] = user.id
     else
-      password_authentication
+      User.current = User.anonymous
+      session[:user_id] = nil
     end
   end
-
-  def password_authentication
-    user = User.try_to_login(params[:username], params[:password])
-
-    if user.nil?
-      invalid_credentials
-    elsif user.new_record?
-      onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
-    else
-      # Valid user
-      successful_authentication(user)
-    end
-  end
-
-  def open_id_authenticate(openid_url)
-    authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url, :method => :post) do |result, identity_url, registration|
-      if result.successful?
-        user = User.find_or_initialize_by_identity_url(identity_url)
-        if user.new_record?
-          # Self-registration off
-          redirect_to(home_url) && return unless Setting.self_registration?
-
-          # Create on the fly
-          user.login = registration['nickname'] unless registration['nickname'].nil?
-          user.mail = registration['email'] unless registration['email'].nil?
-          user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
-          user.random_password
-          user.register
-
-          case Setting.self_registration
-          when '1'
-            register_by_email_activation(user) do
-              onthefly_creation_failed(user)
-            end
-          when '3'
-            register_automatically(user) do
-              onthefly_creation_failed(user)
-            end
-          else
-            register_manually_by_administrator(user) do
-              onthefly_creation_failed(user)
-            end
-          end
-        else
-          # Existing record
-          if user.active?
-            successful_authentication(user)
-          else
-            account_pending
-          end
-        end
-      end
-    end
-  end
-
-  def successful_authentication(user)
-    logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
-    # Valid user
-    self.logged_user = user
-    # generate a key and set cookie if autologin
-    if params[:autologin] && Setting.autologin?
-      set_autologin_cookie(user)
-    end
-    call_hook(:controller_account_success_authentication_after, {:user => user })
-    redirect_back_or_default :controller => 'my', :action => 'page'
-  end
-
-  def set_autologin_cookie(user)
-    token = Token.create(:user => user, :action => 'autologin')
-    cookie_name = Redmine::Configuration['autologin_cookie_name'] || 'autologin'
-    cookie_options = {
-      :value => token.value,
-      :expires => 1.year.from_now,
-      :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
-      :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
-      :httponly => true
-    }
-    cookies[cookie_name] = cookie_options
-  end
-
-  # Onthefly creation failed, display the registration form to fill/fix attributes
-  def onthefly_creation_failed(user, auth_source_options = { })
-    @user = user
-    session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
-    render :action => 'register'
-  end
-
-  def invalid_credentials
-    logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
-    flash.now[:error] = l(:notice_account_invalid_creditentials)
-  end
-
-  # Register a user for email activation.
-  #
-  # Pass a block for behavior when a user fails to save
-  def register_by_email_activation(user, &block)
-    token = Token.new(:user => user, :action => "register")
-    if user.save and token.save
-      Mailer.register(token).deliver
-      flash[:notice] = l(:notice_account_register_done)
-      redirect_to signin_path
-    else
-      yield if block_given?
-    end
-  end
-
-  # Automatically register a user
-  #
-  # Pass a block for behavior when a user fails to save
-  def register_automatically(user, &block)
-    # Automatic activation
-    user.activate
-    user.last_login_on = Time.now
-    if user.save
-      self.logged_user = user
-      flash[:notice] = l(:notice_account_activated)
-      redirect_to :controller => 'my', :action => 'account'
-    else
-      yield if block_given?
-    end
-  end
-
-  # Manual activation by the administrator
-  #
-  # Pass a block for behavior when a user fails to save
-  def register_manually_by_administrator(user, &block)
-    if user.save
-      # Sends an email to the administrators
-      Mailer.account_activation_request(user).deliver
-      account_pending
-    else
-      yield if block_given?
-    end
-  end
-
-  def account_pending
-    flash[:notice] = l(:notice_account_pending)
-    redirect_to signin_path
-  end
 end

app/controllers/activities_controller.rb

@@ -1,75 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 ActivitiesController < ApplicationController
-  menu_item :activity
-  before_filter :find_optional_project
-  accept_rss_auth :index
-
-  def index
-    @days = Setting.activity_days_default.to_i
-
-    if params[:from]
-      begin; @date_to = params[:from].to_date + 1; 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')
-    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
-
-    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
-                                                             :with_subprojects => @with_subprojects,
-                                                             :author => @author)
-    @activity.scope_select {|t| !params["show_#{t}"].nil?}
-    @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
-
-    events = @activity.events(@date_from, @date_to)
-
-    if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, events.size, User.current, current_language])
-      respond_to do |format|
-        format.html {
-          @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-          render :layout => false if request.xhr?
-        }
-        format.atom {
-          title = l(:label_activity)
-          if @author
-            title = @author.name
-          elsif @activity.scope.size == 1
-            title = l("label_#{@activity.scope.first.singularize}_plural")
-          end
-          render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
-        }
-      end
-    end
-
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  private
-
-  # TODO: refactor, duplicated in projects_controller
-  def find_optional_project
-    return true unless params[:id]
-    @project = Project.find(params[:id])
-    authorize
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/admin_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,12 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AdminController < ApplicationController
-  layout 'admin'
+  layout 'base'	
-  menu_item :projects, :only => :projects
-  menu_item :plugins, :only => :plugins
-  menu_item :info, :only => :info
-
   before_filter :require_admin
+
   helper :sort
   include SortHelper	
 
@@ -30,20 +27,25 @@ class AdminController < ApplicationController
   end
 	
   def projects
-    @status = params[:status] || 1
+    sort_init 'name', 'asc'
+    sort_update
     
-    scope = Project.status(@status)
+    @status = params[:status] ? params[:status].to_i : 0
-    scope = scope.like(params[:name]) if params[:name].present?
+    conditions = nil
+    conditions = ["status=?", @status] unless @status == 0
     
-    @projects = scope.all(:order => 'lft')
+    @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
   
-  def plugins
-    @plugins = Redmine::Plugin.all
-  end
-
   # Loads the default configuration
   # (roles, trackers, statuses, workflow, enumerations)
   def default_configuration
@@ -63,7 +65,7 @@ class AdminController < ApplicationController
     # Force ActionMailer to raise delivery errors so we can catch it
     ActionMailer::Base.raise_delivery_errors = true
     begin
-      @test = Mailer.test_email(User.current).deliver
+      @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)
@@ -74,11 +76,11 @@ class AdminController < ApplicationController
   
   def info
     @db_adapter_name = ActiveRecord::Base.connection.adapter_name
-    @checklist = [
+    @flags = {
-      [:text_default_administrator_account_changed, User.default_admin_account_changed?],
+      :default_admin_changed => User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?,
-      [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
+      :file_repository_writable => File.writable?(Attachment.storage_path),
-      [:text_plugin_assets_writable,   File.writable?(Redmine::Plugin.public_directory)],
+      :rmagick_available => Object.const_defined?(:Magick)
-      [:text_rmagick_available,        Object.const_defined?(:Magick)]
+    }
-    ]
+    @plugins = Redmine::Plugin.registered_plugins
   end  
 end

app/controllers/application.rb

@@ -0,0 +1,219 @@
+# 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
+  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/application_controller.rb

@@ -1,590 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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'
-require 'cgi'
-
-class Unauthorized < Exception; end
-
-class ApplicationController < ActionController::Base
-  include Redmine::I18n
-
-  class_attribute :accept_api_auth_actions
-  class_attribute :accept_rss_auth_actions
-  class_attribute :model_object
-
-  layout 'base'
-
-  protect_from_forgery
-  def handle_unverified_request
-    super
-    cookies.delete(:autologin)
-  end
-
-  before_filter :session_expiration, :user_setup, :check_if_login_required, :set_localization
-
-  rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
-  rescue_from ::Unauthorized, :with => :deny_access
-  rescue_from ::ActionView::MissingTemplate, :with => :missing_template
-
-  include Redmine::Search::Controller
-  include Redmine::MenuManager::MenuController
-  helper Redmine::MenuManager::MenuHelper
-
-  def session_expiration
-    if session[:user_id]
-      if session_expired? && !try_to_autologin
-        reset_session
-        flash[:error] = l(:error_session_expired)
-        redirect_to signin_url
-      else
-        session[:atime] = Time.now.utc.to_i
-      end
-    end
-  end
-
-  def session_expired?
-    if Setting.session_lifetime?
-      unless session[:ctime] && (Time.now.utc.to_i - session[:ctime].to_i <= Setting.session_lifetime.to_i * 60)
-        return true
-      end
-    end
-    if Setting.session_timeout?
-      unless session[:atime] && (Time.now.utc.to_i - session[:atime].to_i <= Setting.session_timeout.to_i * 60)
-        return true
-      end
-    end
-    false
-  end
-
-  def start_user_session(user)
-    session[:user_id] = user.id
-    session[:ctime] = Time.now.utc.to_i
-    session[:atime] = Time.now.utc.to_i
-  end
-
-  def user_setup
-    # Check the settings cache for each request
-    Setting.check_cache
-    # Find the current user
-    User.current = find_current_user
-    logger.info("  Current user: " + (User.current.logged? ? "#{User.current.login} (id=#{User.current.id})" : "anonymous")) if logger
-  end
-
-  # Returns the current user or nil if no user is logged in
-  # and starts a session if needed
-  def find_current_user
-    user = nil
-    unless api_request?
-      if session[:user_id]
-        # existing session
-        user = (User.active.find(session[:user_id]) rescue nil)
-      elsif autologin_user = try_to_autologin
-        user = autologin_user
-      elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
-        # RSS key authentication does not start a session
-        user = User.find_by_rss_key(params[:key])
-      end
-    end
-    if user.nil? && Setting.rest_api_enabled? && accept_api_auth?
-      if (key = api_key_from_request)
-        # Use API key
-        user = User.find_by_api_key(key)
-      else
-        # HTTP Basic, either username/password or API key/random
-        authenticate_with_http_basic do |username, password|
-          user = User.try_to_login(username, password) || User.find_by_api_key(username)
-        end
-      end
-      # Switch user if requested by an admin user
-      if user && user.admin? && (username = api_switch_user_from_request)
-        su = User.find_by_login(username)
-        if su && su.active?
-          logger.info("  User switched by: #{user.login} (id=#{user.id})") if logger
-          user = su
-        else
-          render_error :message => 'Invalid X-Redmine-Switch-User header', :status => 412
-        end
-      end
-    end
-    user
-  end
-
-  def try_to_autologin
-    if cookies[:autologin] && Setting.autologin?
-      # auto-login feature starts a new session
-      user = User.try_to_autologin(cookies[:autologin])
-      if user
-        reset_session
-        start_user_session(user)
-      end
-      user
-    end
-  end
-
-  # Sets the logged in user
-  def logged_user=(user)
-    reset_session
-    if user && user.is_a?(User)
-      User.current = user
-      start_user_session(user)
-    else
-      User.current = User.anonymous
-    end
-  end
-
-  # Logs out current user
-  def logout_user
-    if User.current.logged?
-      cookies.delete :autologin
-      Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
-      self.logged_user = nil
-    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
-    lang = nil
-    if User.current.logged?
-      lang = find_language(User.current.language)
-    end
-    if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
-      accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first
-      if !accept_lang.blank?
-        accept_lang = accept_lang.downcase
-        lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
-      end
-    end
-    lang ||= Setting.default_language
-    set_language_if_valid(lang)
-  end
-
-  def require_login
-    if !User.current.logged?
-      # Extract only the basic url parameters on non-GET requests
-      if request.get?
-        url = url_for(params)
-      else
-        url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
-      end
-      respond_to do |format|
-        format.html { redirect_to :controller => "account", :action => "login", :back_url => url }
-        format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
-        format.xml  { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
-        format.js   { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
-        format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
-      end
-      return false
-    end
-    true
-  end
-
-  def require_admin
-    return unless require_login
-    if !User.current.admin?
-      render_403
-      return false
-    end
-    true
-  end
-
-  def deny_access
-    User.current.logged? ? render_403 : require_login
-  end
-
-  # Authorize the user for the requested action
-  def authorize(ctrl = params[:controller], action = params[:action], global = false)
-    allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
-    if allowed
-      true
-    else
-      if @project && @project.archived?
-        render_403 :message => :notice_not_authorized_archived_project
-      else
-        deny_access
-      end
-    end
-  end
-
-  # Authorize the user for the requested action outside a project
-  def authorize_global(ctrl = params[:controller], action = params[:action], global = true)
-    authorize(ctrl, action, global)
-  end
-
-  # Find project of id params[:id]
-  def find_project
-    @project = Project.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  # Find project of id params[:project_id]
-  def find_project_by_project_id
-    @project = Project.find(params[:project_id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  # Find a project based on params[:project_id]
-  # TODO: some subclasses override this, see about merging their logic
-  def find_optional_project
-    @project = Project.find(params[:project_id]) unless params[:project_id].blank?
-    allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
-    allowed ? true : deny_access
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  # Finds and sets @project based on @object.project
-  def find_project_from_association
-    render_404 unless @object.present?
-
-    @project = @object.project
-  end
-
-  def find_model_object
-    model = self.class.model_object
-    if model
-      @object = model.find(params[:id])
-      self.instance_variable_set('@' + controller_name.singularize, @object) if @object
-    end
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  def self.model_object(model)
-    self.model_object = model
-  end
-
-  # Find the issue whose id is the :id parameter
-  # Raises a Unauthorized exception if the issue is not visible
-  def find_issue
-    # Issue.visible.find(...) can not be used to redirect user to the login form
-    # if the issue actually exists but requires authentication
-    @issue = Issue.find(params[:id])
-    raise Unauthorized unless @issue.visible?
-    @project = @issue.project
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  # Find issues with a single :id param or :ids array param
-  # Raises a Unauthorized exception if one of the issues is not visible
-  def find_issues
-    @issues = Issue.find_all_by_id(params[:id] || params[:ids])
-    raise ActiveRecord::RecordNotFound if @issues.empty?
-    raise Unauthorized unless @issues.all?(&:visible?)
-    @projects = @issues.collect(&:project).compact.uniq
-    @project = @projects.first if @projects.size == 1
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  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.archived?
-      if @project.visible?
-        true
-      else
-        deny_access
-      end
-    else
-      @project = nil
-      render_404
-      false
-    end
-  end
-
-  def back_url
-    url = params[:back_url]
-    if url.nil? && referer = request.env['HTTP_REFERER']
-      url = CGI.unescape(referer.to_s)
-    end
-    url
-  end
-
-  def redirect_back_or_default(default)
-    back_url = params[:back_url].to_s
-    if back_url.present?
-      begin
-        uri = URI.parse(back_url)
-        # do not redirect user to another host or to the login or register page
-        if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
-          redirect_to(back_url)
-          return
-        end
-      rescue URI::InvalidURIError
-        logger.warn("Could not redirect to invalid URL #{back_url}")
-        # redirect to default
-      end
-    end
-    redirect_to default
-    false
-  end
-
-  # Redirects to the request referer if present, redirects to args or call block otherwise.
-  def redirect_to_referer_or(*args, &block)
-    redirect_to :back
-  rescue ::ActionController::RedirectBackError
-    if args.any?
-      redirect_to *args
-    elsif block_given?
-      block.call
-    else
-      raise "#redirect_to_referer_or takes arguments or a block"
-    end
-  end
-
-  def render_403(options={})
-    @project = nil
-    render_error({:message => :notice_not_authorized, :status => 403}.merge(options))
-    return false
-  end
-
-  def render_404(options={})
-    render_error({:message => :notice_file_not_found, :status => 404}.merge(options))
-    return false
-  end
-
-  # Renders an error response
-  def render_error(arg)
-    arg = {:message => arg} unless arg.is_a?(Hash)
-
-    @message = arg[:message]
-    @message = l(@message) if @message.is_a?(Symbol)
-    @status = arg[:status] || 500
-
-    respond_to do |format|
-      format.html {
-        render :template => 'common/error', :layout => use_layout, :status => @status
-      }
-      format.any { head @status }
-    end
-  end
-
-  # Handler for ActionView::MissingTemplate exception
-  def missing_template
-    logger.warn "Missing template, responding with 404"
-    @project = nil
-    render_404
-  end
-
-  # Filter for actions that provide an API response
-  # but have no HTML representation for non admin users
-  def require_admin_or_api_request
-    return true if api_request?
-    if User.current.admin?
-      true
-    elsif User.current.logged?
-      render_error(:status => 406)
-    else
-      deny_access
-    end
-  end
-
-  # Picks which layout to use based on the request
-  #
-  # @return [boolean, string] name of the layout to use or false for no layout
-  def use_layout
-    request.xhr? ? false : 'base'
-  end
-
-  def invalid_authenticity_token
-    if api_request?
-      logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
-    end
-    render_error "Invalid form authenticity token."
-  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", :formats => [:atom], :layout => false,
-           :content_type => 'application/atom+xml'
-  end
-
-  def self.accept_rss_auth(*actions)
-    if actions.any?
-      self.accept_rss_auth_actions = actions
-    else
-      self.accept_rss_auth_actions || []
-    end
-  end
-
-  def accept_rss_auth?(action=action_name)
-    self.class.accept_rss_auth.include?(action.to_sym)
-  end
-
-  def self.accept_api_auth(*actions)
-    if actions.any?
-      self.accept_api_auth_actions = actions
-    else
-      self.accept_api_auth_actions || []
-    end
-  end
-
-  def accept_api_auth?(action=action_name)
-    self.class.accept_api_auth.include?(action.to_sym)
-  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
-
-  # Returns offset and limit used to retrieve objects
-  # for an API response based on offset, limit and page parameters
-  def api_offset_and_limit(options=params)
-    if options[:offset].present?
-      offset = options[:offset].to_i
-      if offset < 0
-        offset = 0
-      end
-    end
-    limit = options[:limit].to_i
-    if limit < 1
-      limit = 25
-    elsif limit > 100
-      limit = 100
-    end
-    if offset.nil? && options[:page].present?
-      offset = (options[:page].to_i - 1) * limit
-      offset = 0 if offset < 0
-    end
-    offset ||= 0
-
-    [offset, limit]
-  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
-  rescue
-    nil
-  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
-
-  def api_request?
-    %w(xml json).include? params[:format]
-  end
-
-  # Returns the API key present in the request
-  def api_key_from_request
-    if params[:key].present?
-      params[:key].to_s
-    elsif request.headers["X-Redmine-API-Key"].present?
-      request.headers["X-Redmine-API-Key"].to_s
-    end
-  end
-
-  # Returns the API 'switch user' value if present
-  def api_switch_user_from_request
-    request.headers["X-Redmine-Switch-User"].to_s.presence
-  end
-
-  # Renders a warning flash if obj has unsaved attachments
-  def render_attachment_warning_if_needed(obj)
-    flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
-  end
-
-  # Sets the `flash` notice or error based the number of issues that did not save
-  #
-  # @param [Array, Issue] issues all of the saved and unsaved Issues
-  # @param [Array, Integer] unsaved_issue_ids the issue ids that were not saved
-  def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
-    if unsaved_issue_ids.empty?
-      flash[:notice] = l(:notice_successful_update) unless issues.empty?
-    else
-      flash[:error] = l(:notice_failed_to_save_issues,
-                        :count => unsaved_issue_ids.size,
-                        :total => issues.size,
-                        :ids => '#' + unsaved_issue_ids.join(', #'))
-    end
-  end
-
-  # Rescues an invalid query statement. Just in case...
-  def query_statement_invalid(exception)
-    logger.error "Query::StatementInvalid: #{exception.message}" if logger
-    session.delete(:query)
-    sort_clear if respond_to?(:sort_clear)
-    render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
-  end
-
-  # Renders a 200 response for successfull updates or deletions via the API
-  def render_api_ok
-    render_api_head :ok
-  end
-
-  # Renders a head API response
-  def render_api_head(status)
-    # #head would return a response body with one space
-    render :text => '', :status => status, :layout => nil
-  end
-
-  # Renders API response on validation failure
-  def render_validation_errors(objects)
-    if objects.is_a?(Array)
-      @error_messages = objects.map {|object| object.errors.full_messages}.flatten
-    else
-      @error_messages = objects.errors.full_messages
-    end
-    render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => nil
-  end
-
-  # Overrides #_include_layout? so that #render with no arguments
-  # doesn't use the layout for api requests
-  def _include_layout?(*args)
-    api_request? ? false : super
-  end
-end

app/controllers/attachments_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,94 +16,28 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AttachmentsController < ApplicationController
-  before_filter :find_project, :except => :upload
+  layout 'base'
-  before_filter :file_readable, :read_authorize, :only => [:show, :download, :thumbnail]
+  before_filter :find_project
-  before_filter :delete_authorize, :only => :destroy
-  before_filter :authorize_global, :only => :upload
-
-  accept_api_auth :show, :download, :upload
 
   def show
-    respond_to do |format|
+    if @attachment.is_diff?
-      format.html {
+      @diff = File.new(@attachment.diskfile, "rb").read
-        if @attachment.is_diff?
+      render :action => 'diff'
-          @diff = File.new(@attachment.diskfile, "rb").read
+    elsif @attachment.is_text?
-          @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
+      @content = File.new(@attachment.diskfile, "rb").read
-          @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
+      render :action => 'file'
-          # Save diff type as user preference
+    elsif
-          if User.current.logged? && @diff_type != User.current.pref[:diff_type]
+      download
-            User.current.pref[:diff_type] = @diff_type
-            User.current.preference.save
-          end
-          render :action => 'diff'
-        elsif @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte
-          @content = File.new(@attachment.diskfile, "rb").read
-          render :action => 'file'
-        else
-          download
-        end
-      }
-      format.api
     end
   end
   
   def download
-    if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
+    @attachment.increment_download if @attachment.container.is_a?(Version)
-      @attachment.increment_download
-    end
     
-    if stale?(:etag => @attachment.digest)
+    # images are sent inline
-      # images are sent inline
+    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-      send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+                                    :type => @attachment.content_type, 
-                                      :type => detect_content_type(@attachment),
+                                    :disposition => (@attachment.image? ? 'inline' : 'attachment')
-                                      :disposition => (@attachment.image? ? 'inline' : 'attachment')
-    end
-  end
-
-  def thumbnail
-    if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
-      if stale?(:etag => thumbnail)
-        send_file thumbnail,
-          :filename => filename_for_content_disposition(@attachment.filename),
-          :type => detect_content_type(@attachment),
-          :disposition => 'inline'
-      end
-    else
-      # No thumbnail for the attachment or thumbnail could not be created
-      render :nothing => true, :status => 404
-    end
-  end
-
-  def upload
-    # Make sure that API users get used to set this content type
-    # as it won't trigger Rails' automatic parsing of the request body for parameters
-    unless request.content_type == 'application/octet-stream'
-      render :nothing => true, :status => 406
-      return
-    end
-
-    @attachment = Attachment.new(:file => request.raw_post)
-    @attachment.author = User.current
-    @attachment.filename = params[:filename].presence || Redmine::Utils.random_hex(16)
-
-    if @attachment.save
-      respond_to do |format|
-        format.api { render :action => 'upload', :status => :created }
-      end
-    else
-      respond_to do |format|
-        format.api { render_validation_errors(@attachment) }
-      end
-    end
-  end
-
-  def destroy
-    if @attachment.container.respond_to?(:init_journal)
-      @attachment.container.init_journal(User.current)
-    end
-    # Make sure association callbacks are called
-    @attachment.container.attachments.delete(@attachment)
-    redirect_to_referer_or project_path(@project)
   end
  
 private
@@ -111,29 +45,12 @@ private
     @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
-
-  # Checks that the file exists and is readable
-  def file_readable
-    @attachment.readable? ? true : render_404
-  end
-
-  def read_authorize
-    @attachment.visible? ? true : deny_access
-  end
-
-  def delete_authorize
-    @attachment.deletable? ? true : deny_access
-  end
-
-  def detect_content_type(attachment)
-    content_type = attachment.content_type
-    if content_type.blank?
-      content_type = Redmine::MimeType.of(attachment.filename)
-    end
-    content_type.to_s
-  end
 end

app/controllers/auth_sources_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,25 +16,32 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AuthSourcesController < ApplicationController
-  layout 'admin'
+  layout 'base'	
-  menu_item :ldap_authentication
-
   before_filter :require_admin
 
   def index
-    @auth_source_pages, @auth_sources = paginate AuthSource, :per_page => 10
+    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
-    klass_name = params[:type] || 'AuthSourceLdap'
+    @auth_source = AuthSourceLdap.new
-    @auth_source = AuthSource.new_subclass_instance(klass_name, params[:auth_source])
   end
 
   def create
-    @auth_source = AuthSource.new_subclass_instance(params[:type], params[:auth_source])
+    @auth_source = AuthSourceLdap.new(params[:auth_source])
     if @auth_source.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list'
     else
       render :action => 'new'
     end
@@ -48,21 +55,21 @@ class AuthSourcesController < ApplicationController
     @auth_source = AuthSource.find(params[:id])
     if @auth_source.update_attributes(params[:auth_source])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list'
     else
       render :action => 'edit'
     end
   end
   
   def test_connection
-    @auth_source = AuthSource.find(params[:id])
+    @auth_method = AuthSource.find(params[:id])
     begin
-      @auth_source.test_connection
+      @auth_method.test_connection
       flash[:notice] = l(:notice_successful_connection)
-    rescue Exception => e
+    rescue => text
-      flash[:error] = l(:error_unable_to_connect, e.message)
+      flash[:error] = "Unable to connect (#{text})"
     end
-    redirect_to :action => 'index'
+    redirect_to :action => 'list'
   end
 
   def destroy
@@ -71,6 +78,6 @@ class AuthSourcesController < ApplicationController
       @auth_source.destroy
       flash[:notice] = l(:notice_successful_delete)
     end
-    redirect_to :action => 'index'
+    redirect_to :action => 'list'
   end
 end

app/controllers/auto_completes_controller.rb

@@ -1,44 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 AutoCompletesController < ApplicationController
-  before_filter :find_project
-
-  def issues
-    @issues = []
-    q = (params[:q] || params[:term]).to_s.strip
-    if q.present?
-      scope = (params[:scope] == "all" || @project.nil? ? Issue : @project.issues).visible
-      if q.match(/^\d+$/)
-        @issues << scope.find_by_id(q.to_i)
-      end
-      @issues += scope.where("LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%").order("#{Issue.table_name}.id DESC").limit(10).all
-      @issues.compact!
-    end
-    render :layout => false
-  end
-
-  private
-
-  def find_project
-    if params[:project_id].present?
-      @project = Project.find(params[:project_id])
-    end
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/boards_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,16 +16,18 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class BoardsController < ApplicationController
-  default_search_scope :messages
+  layout 'base'
-  before_filter :find_project_by_project_id, :find_board_if_available, :authorize
+  before_filter :find_project, :authorize
-  accept_rss_auth :index, :show
 
+  helper :messages
+  include MessagesHelper
   helper :sort
   include SortHelper
   helper :watchers
+  include WatchersHelper
  
   def index
-    @boards = @project.boards.includes(:last_message => :author).all
+    @boards = @project.boards
     # show the board if there is only one
     if @boards.size == 1
       @board = @boards.first
@@ -34,70 +36,49 @@ class BoardsController < ApplicationController
   end
 
   def show
-    respond_to do |format|
+    sort_init "#{Message.table_name}.updated_on", "desc"
-      format.html {
+    sort_update	
-        sort_init 'updated_on', 'desc'
-        sort_update	'created_on' => "#{Message.table_name}.created_on",
-                    'replies' => "#{Message.table_name}.replies_count",
-                    'updated_on' => "#{Message.table_name}.updated_on"
       
-        @topic_count = @board.topics.count
+    @topic_count = @board.topics.count
-        @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
+    @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
-        @topics =  @board.topics.reorder("#{Message.table_name}.sticky DESC").order(sort_clause).all(
+    @topics =  @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC, #{sort_clause}",
-                                      :include => [:author, {:last_reply => :author}],
+                                  :include => [:author, {:last_reply => :author}],
-                                      :limit  =>  @topic_pages.items_per_page,
+                                  :limit  =>  @topic_pages.items_per_page,
-                                      :offset =>  @topic_pages.current.offset)
+                                  :offset =>  @topic_pages.current.offset
-        @message = Message.new(:board => @board)
+    render :action => 'show', :layout => !request.xhr?
-        render :action => 'show', :layout => !request.xhr?
-      }
-      format.atom {
-        @messages = @board.messages.find :all, :order => 'created_on DESC',
-                                               :include => [:author, :board],
-                                               :limit => Setting.feeds_limit.to_i
-        render_feed(@messages, :title => "#{@project}: #{@board}")
-      }
-    end
   end
   
+  verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
+
   def new
-    @board = @project.boards.build
+    @board = Board.new(params[:board])
-    @board.safe_attributes = params[:board]
+    @board.project = @project
-  end
+    if request.post? && @board.save
-
-  def create
-    @board = @project.boards.build
-    @board.safe_attributes = params[:board]
-    if @board.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to_settings_in_projects
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
-    else
-      render :action => 'new'
     end
   end
 
   def edit
-  end
+    if request.post? && @board.update_attributes(params[:board])
-
+      case params[:position]
-  def update
+      when 'highest'; @board.move_to_top
-    @board.safe_attributes = params[:board]
+      when 'higher'; @board.move_higher
-    if @board.save
+      when 'lower'; @board.move_lower
-      redirect_to_settings_in_projects
+      when 'lowest'; @board.move_to_bottom
-    else
+      end if params[:position]
-      render :action => 'edit'
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
     end
   end
 
   def destroy
     @board.destroy
-    redirect_to_settings_in_projects
-  end
-
-private
-  def redirect_to_settings_in_projects
     redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
   end
   
-  def find_board_if_available
+private
+  def find_project
+    @project = Project.find(params[:project_id])
     @board = @project.boards.find(params[:id]) if params[:id]
   rescue ActiveRecord::RecordNotFound
     render_404

app/controllers/calendars_controller.rb

@@ -1,56 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 CalendarsController < ApplicationController
-  menu_item :calendar
-  before_filter :find_optional_project
-
-  rescue_from Query::StatementInvalid, :with => :query_statement_invalid
-
-  helper :issues
-  helper :projects
-  helper :queries
-  include QueriesHelper
-  helper :sort
-  include SortHelper
-
-  def show
-    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)
-    retrieve_query
-    @query.group_by = nil
-    if @query.valid?
-      events = []
-      events += @query.issues(:include => [:tracker, :assigned_to, :priority],
-                              :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
-                              )
-      events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
-
-      @calendar.events = events
-    end
-
-    render :action => 'show', :layout => false if request.xhr?
-  end
-end

app/controllers/comments_controller.rb

@@ -1,53 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 CommentsController < ApplicationController
-  default_search_scope :news
-  model_object News
-  before_filter :find_model_object
-  before_filter :find_project_from_association
-  before_filter :authorize
-
-  def create
-    raise Unauthorized unless @news.commentable?
-
-    @comment = Comment.new
-    @comment.safe_attributes = params[:comment]
-    @comment.author = User.current
-    if @news.comments << @comment
-      flash[:notice] = l(:label_comment_added)
-    end
-
-    redirect_to :controller => 'news', :action => 'show', :id => @news
-  end
-
-  def destroy
-    @news.comments.find(params[:comment_id]).destroy
-    redirect_to :controller => 'news', :action => 'show', :id => @news
-  end
-
-  private
-
-  # ApplicationController's find_model_object sets it based on the controller
-  # name so it needs to be overriden and set to @news instead
-  def find_model_object
-    super
-    @news = @object
-    @comment = nil
-    @news
-  end
-end

app/controllers/context_menus_controller.rb

@@ -1,86 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 ContextMenusController < ApplicationController
-  helper :watchers
-  helper :issues
-
-  def issues
-    @issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project)
-    if (@issues.size == 1)
-      @issue = @issues.first
-    end
-    @issue_ids = @issues.map(&:id).sort
-
-    @allowed_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
-    @projects = @issues.collect(&:project).compact.uniq
-    @project = @projects.first if @projects.size == 1
-
-    @can = {:edit => User.current.allowed_to?(:edit_issues, @projects),
-            :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
-            :update => (User.current.allowed_to?(:edit_issues, @projects) || (User.current.allowed_to?(:change_status, @projects) && !@allowed_statuses.blank?)),
-            :move => (@project && User.current.allowed_to?(:move_issues, @project)),
-            :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
-            :delete => User.current.allowed_to?(:delete_issues, @projects)
-            }
-    if @project
-      if @issue
-        @assignables = @issue.assignable_users
-      else
-        @assignables = @project.assignable_users
-      end
-      @trackers = @project.trackers
-    else
-      #when multiple projects, we only keep the intersection of each set
-      @assignables = @projects.map(&:assignable_users).reduce(:&)
-      @trackers = @projects.map(&:trackers).reduce(:&)
-    end
-    @versions = @projects.map {|p| p.shared_versions.open}.reduce(:&)
-
-    @priorities = IssuePriority.active.reverse
-    @back = back_url
-
-    @options_by_custom_field = {}
-    if @can[:edit]
-      custom_fields = @issues.map(&:available_custom_fields).reduce(:&).select do |f|
-        %w(bool list user version).include?(f.field_format) && !f.multiple?
-      end
-      custom_fields.each do |field|
-        values = field.possible_values_options(@projects)
-        if values.any?
-          @options_by_custom_field[field] = values
-        end
-      end
-    end
-
-    @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
-    render :layout => false
-  end
-
-  def time_entries
-    @time_entries = TimeEntry.all(
-       :conditions => {:id => params[:ids]}, :include => :project)
-    @projects = @time_entries.collect(&:project).compact.uniq
-    @project = @projects.first if @projects.size == 1
-    @activities = TimeEntryActivity.shared.active
-    @can = {:edit   => User.current.allowed_to?(:edit_time_entries, @projects),
-            :delete => User.current.allowed_to?(:edit_time_entries, @projects)
-            }
-    @back = back_url
-    render :layout => false
-  end
-end

app/controllers/custom_fields_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,63 +16,74 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CustomFieldsController < ApplicationController
-  layout 'admin'
+  layout 'base'		
-
   before_filter :require_admin
-  before_filter :build_new_custom_field, :only => [:new, :create]
-  before_filter :find_custom_field, :only => [:edit, :update, :destroy]
 
   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
-  end
+    case params[:type]
-
+      when "IssueCustomField" 
-  def create
+        @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)
-      call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
+      redirect_to :action => 'list', :tab => @custom_field.class.name
-      redirect_to :action => 'index', :tab => @custom_field.class.name
-    else
-      render :action => 'new'
     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 update
+  def move
-    if request.put? and @custom_field.update_attributes(params[:custom_field])
+    @custom_field = CustomField.find(params[:id])
-      flash[:notice] = l(:notice_successful_update)
+    case params[:position]
-      call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
+    when 'highest'
-      redirect_to :action => 'index', :tab => @custom_field.class.name
+      @custom_field.move_to_top
-    else
+    when 'higher'
-      render :action => 'edit'
+      @custom_field.move_higher
-    end
+    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.destroy
+    @custom_field = CustomField.find(params[:id]).destroy
-    redirect_to :action => 'index', :tab => @custom_field.class.name
+    redirect_to :action => 'list', :tab => @custom_field.class.name
   rescue
-    flash[:error] = l(:error_can_not_delete_custom_field)
+    flash[:error] = "Unable to delete custom field"
-    redirect_to :action => 'index'
+    redirect_to :action => 'list'
-  end
-
-  private
-
-  def build_new_custom_field
-    @custom_field = CustomField.new_subclass_instance(params[:type], params[:custom_field])
-    if @custom_field.nil?
-      render_404
-    end
-  end
-
-  def find_custom_field
-    @custom_field = CustomField.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
   end
 end

app/controllers/documents_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,11 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DocumentsController < ApplicationController
-  default_search_scope :documents
+  layout 'base'
-  model_object Document
+  before_filter :find_project, :only => [:index, :new]
-  before_filter :find_project_by_project_id, :only => [:index, :new, :create]
+  before_filter :find_document, :except => [:index, :new]
-  before_filter :find_model_object, :except => [:index, :new, :create]
-  before_filter :find_project_from_association, :except => [:index, :new, :create]
   before_filter :authorize
   
   helper :attachments
@@ -30,7 +28,7 @@ class DocumentsController < ApplicationController
     documents = @project.documents.find :all, :include => [:attachments, :category]
     case @sort_by
     when 'date'
-      @grouped = documents.group_by {|d| d.updated_on.to_date }
+      @grouped = documents.group_by {|d| d.created_on.to_date }
     when 'title'
       @grouped = documents.group_by {|d| d.title.first.upcase}
     when 'author'
@@ -38,7 +36,6 @@ class DocumentsController < ApplicationController
     else
       @grouped = documents.group_by(&:category)
     end
-    @document = @project.documents.build
     render :layout => false if request.xhr?
   end
   
@@ -47,48 +44,50 @@ class DocumentsController < ApplicationController
   end
 
   def new
-    @document = @project.documents.build
+    @document = @project.documents.build(params[:document])    
-    @document.safe_attributes = params[:document]
+    if request.post? and @document.save	
-  end
+      attach_files(@document, params[:attachments])
-
-  def create
-    @document = @project.documents.build
-    @document.safe_attributes = params[:document]
-    @document.save_attachments(params[:attachments])
-    if @document.save
-      render_attachment_warning_if_needed(@document)
       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
-    else
-      render :action => 'new'
     end
   end
   
   def edit
-  end
+    @categories = Enumeration::get_values('DCAT')
-
+    if request.post? and @document.update_attributes(params[:document])
-  def update
-    @document.safe_attributes = params[:document]
-    if request.put? and @document.save
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'show', :id => @document
-    else
-      render :action => 'edit'
     end
   end  
 
   def destroy
-    @document.destroy if request.delete?
+    @document.destroy
     redirect_to :controller => 'documents', :action => 'index', :project_id => @project
   end
   
   def add_attachment
-    attachments = Attachment.attach_files(@document, params[:attachments])
+    attachments = attach_files(@document, params[:attachments])
-    render_attachment_warning_if_needed(@document)
+    Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
-
-    if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
-      Mailer.attachments_added(attachments[:files]).deliver
-    end
     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

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,83 +16,79 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class EnumerationsController < ApplicationController
-  layout 'admin'
+  layout 'base'
-
+  before_filter :require_admin
-  before_filter :require_admin, :except => :index
-  before_filter :require_admin_or_api_request, :only => :index
-  before_filter :build_new_enumeration, :only => [:new, :create]
-  before_filter :find_enumeration, :only => [:edit, :update, :destroy]
-  accept_api_auth :index
-
-  helper :custom_fields
   
   def index
-    respond_to do |format|
+    list
-      format.html
+    render :action => 'list'
-      format.api {
+  end
-        @klass = Enumeration.get_subclass(params[:type])
+
-        if @klass
+  # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
-          @enumerations = @klass.shared.sorted.all
+  verify :method => :post, :only => [ :destroy, :create, :update ],
-        else
+         :redirect_to => { :action => :list }
-          render_404
+
-        end
+  def list
-      }
-    end
   end
 
   def new
+    @enumeration = Enumeration.new(:opt => params[:opt])
   end
 
   def create
-    if request.post? && @enumeration.save
+    @enumeration = Enumeration.new(params[:enumeration])
+    if @enumeration.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list', :opt => @enumeration.opt
     else
       render :action => 'new'
     end
   end
 
   def edit
+    @enumeration = Enumeration.find(params[:id])
   end
 
   def update
-    if request.put? && @enumeration.update_attributes(params[:enumeration])
+    @enumeration = Enumeration.find(params[:id])
+    if @enumeration.update_attributes(params[:enumeration])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'index'
+      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'
-      return
     elsif params[:reassign_to_id]
-      if reassign_to = @enumeration.class.find_by_id(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'
-        return
       end
     end
-    @enumerations = @enumeration.class.all - [@enumeration]
+    @enumerations = Enumeration.get_values(@enumeration.opt) - [@enumeration]
-  end
+  #rescue
-
+  #  flash[:error] = 'Unable to delete enumeration'
-  private
+  #  redirect_to :action => 'index'
-
-  def build_new_enumeration
-    class_name = params[:enumeration] && params[:enumeration][:type] || params[:type]
-    @enumeration = Enumeration.new_subclass_instance(class_name, params[:enumeration])
-    if @enumeration.nil?
-      render_404
-    end
-  end
-
-  def find_enumeration
-    @enumeration = Enumeration.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
   end
 end

app/controllers/files_controller.rb

@@ -1,53 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 FilesController < ApplicationController
-  menu_item :files
-
-  before_filter :find_project_by_project_id
-  before_filter :authorize
-
-  helper :sort
-  include SortHelper
-
-  def index
-    sort_init 'filename', 'asc'
-    sort_update 'filename' => "#{Attachment.table_name}.filename",
-                'created_on' => "#{Attachment.table_name}.created_on",
-                'size' => "#{Attachment.table_name}.filesize",
-                'downloads' => "#{Attachment.table_name}.downloads"
-
-    @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
-    @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
-    render :layout => !request.xhr?
-  end
-
-  def new
-    @versions = @project.versions.sort
-  end
-
-  def create
-    container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
-    attachments = Attachment.attach_files(container, params[:attachments])
-    render_attachment_warning_if_needed(container)
-
-    if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-      Mailer.attachments_added(attachments[:files]).deliver
-    end
-    redirect_to project_files_path(@project)
-  end
-end

app/controllers/gantts_controller.rb

@@ -1,48 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 GanttsController < ApplicationController
-  menu_item :gantt
-  before_filter :find_optional_project
-
-  rescue_from Query::StatementInvalid, :with => :query_statement_invalid
-
-  helper :gantt
-  helper :issues
-  helper :projects
-  helper :queries
-  include QueriesHelper
-  helper :sort
-  include SortHelper
-  include Redmine::Export::PDF
-
-  def show
-    @gantt = Redmine::Helpers::Gantt.new(params)
-    @gantt.project = @project
-    retrieve_query
-    @query.group_by = nil
-    @gantt.query = @query if @query.valid?
-
-    basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
-
-    respond_to do |format|
-      format.html { render :action => "show", :layout => !request.xhr? }
-      format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
-      format.pdf  { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => "#{basename}.pdf") }
-    end
-  end
-end

app/controllers/groups_controller.rb

@@ -1,140 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 GroupsController < ApplicationController
-  layout 'admin'
-
-  before_filter :require_admin
-  before_filter :find_group, :except => [:index, :new, :create]
-  accept_api_auth :index, :show, :create, :update, :destroy, :add_users, :remove_user
-
-  helper :custom_fields
-
-  def index
-    @groups = Group.sorted.all
-
-    respond_to do |format|
-      format.html
-      format.api
-    end
-  end
-
-  def show
-    respond_to do |format|
-      format.html
-      format.api
-    end
-  end
-
-  def new
-    @group = Group.new
-  end
-
-  def create
-    @group = Group.new
-    @group.safe_attributes = params[:group]
-
-    respond_to do |format|
-      if @group.save
-        format.html {
-          flash[:notice] = l(:notice_successful_create)
-          redirect_to(params[:continue] ? new_group_path : groups_path)
-        }
-        format.api  { render :action => 'show', :status => :created, :location => group_url(@group) }
-      else
-        format.html { render :action => "new" }
-        format.api  { render_validation_errors(@group) }
-      end
-    end
-  end
-
-  def edit
-  end
-
-  def update
-    @group.safe_attributes = params[:group]
-
-    respond_to do |format|
-      if @group.save
-        flash[:notice] = l(:notice_successful_update)
-        format.html { redirect_to(groups_path) }
-        format.api  { render_api_ok }
-      else
-        format.html { render :action => "edit" }
-        format.api  { render_validation_errors(@group) }
-      end
-    end
-  end
-
-  def destroy
-    @group.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(groups_url) }
-      format.api  { render_api_ok }
-    end
-  end
-
-  def add_users
-    @users = User.find_all_by_id(params[:user_id] || params[:user_ids])
-    @group.users << @users if request.post?
-    respond_to do |format|
-      format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
-      format.js
-      format.api { render_api_ok }
-    end
-  end
-
-  def remove_user
-    @group.users.delete(User.find(params[:user_id])) if request.delete?
-    respond_to do |format|
-      format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
-      format.js
-      format.api { render_api_ok }
-    end
-  end
-
-  def autocomplete_for_user
-    @users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100)
-    render :layout => false
-  end
-
-  def edit_membership
-    @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
-    @membership.save if request.post?
-    respond_to do |format|
-      format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
-      format.js
-    end
-  end
-
-  def destroy_membership
-    Member.find(params[:membership_id]).destroy if request.post?
-    respond_to do |format|
-      format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
-      format.js
-    end
-  end
-
-  private
-
-  def find_group
-    @group = Group.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/issue_categories_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,102 +16,38 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueCategoriesController < ApplicationController
+  layout 'base'
   menu_item :settings
-  model_object IssueCategory
+  before_filter :find_project, :authorize
-  before_filter :find_model_object, :except => [:index, :new, :create]
-  before_filter :find_project_from_association, :except => [:index, :new, :create]
-  before_filter :find_project_by_project_id, :only => [:index, :new, :create]
-  before_filter :authorize
-  accept_api_auth :index, :show, :create, :update, :destroy
   
-  def index
+  verify :method => :post, :only => :destroy
-    respond_to do |format|
-      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project }
-      format.api { @categories = @project.issue_categories.all }
-    end
-  end
-
-  def show
-    respond_to do |format|
-      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project }
-      format.api
-    end
-  end
-
-  def new
-    @category = @project.issue_categories.build
-    @category.safe_attributes = params[:issue_category]
-
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-
-  def create
-    @category = @project.issue_categories.build
-    @category.safe_attributes = params[:issue_category]
-    if @category.save
-      respond_to do |format|
-        format.html do
-          flash[:notice] = l(:notice_successful_create)
-          redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-        end
-        format.js
-        format.api { render :action => 'show', :status => :created, :location => issue_category_path(@category) }
-      end
-    else
-      respond_to do |format|
-        format.html { render :action => 'new'}
-        format.js   { render :action => 'new'}
-        format.api { render_validation_errors(@category) }
-      end
-    end
-  end
 
   def edit
-  end
+    if request.post? and @category.update_attributes(params[:category])
-
+      flash[:notice] = l(:notice_successful_update)
-  def update
+      redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-    @category.safe_attributes = params[:issue_category]
-    if @category.save
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_successful_update)
-          redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-        }
-        format.api { render_api_ok }
-      end
-    else
-      respond_to do |format|
-        format.html { render :action => 'edit' }
-        format.api { render_validation_errors(@category) }
-      end
     end
   end
 
   def destroy
     @issue_count = @category.issues.size
-    if @issue_count == 0 || params[:todo] || api_request?
+    if @issue_count == 0
-      reassign_to = nil
+      # No issue assigned to this category
-      if params[:reassign_to_id] && (params[:todo] == 'reassign' || params[:todo].blank?)
+      @category.destroy
-        reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id])
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
-      end
+    elsif params[:todo]
+      reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign'
       @category.destroy(reassign_to)
-      respond_to do |format|
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
-        format.html { redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' }
-        format.api { render_api_ok }
-      end
-      return
     end
     @categories = @project.issue_categories - [@category]
   end
 
 private
-  # Wrap ApplicationController's find_model_object method to set
+  def find_project
-  # @category instead of just @issue_category
+    @category = IssueCategory.find(params[:id])
-  def find_model_object
+    @project = @category.project
-    super
+  rescue ActiveRecord::RecordNotFound
-    @category = @object
+    render_404
   end    
 end

app/controllers/issue_relations_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,72 +16,43 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueRelationsController < ApplicationController
-  before_filter :find_issue, :find_project_from_association, :authorize, :only => [:index, :create]
+  layout 'base'
-  before_filter :find_relation, :except => [:index, :create]
+  before_filter :find_project, :authorize
   
-  accept_api_auth :index, :show, :create, :destroy
+  def new
-
-  def index
-    @relations = @issue.relations
-
-    respond_to do |format|
-      format.html { render :nothing => true }
-      format.api
-    end
-  end
-
-  def show
-    raise Unauthorized unless @relation.visible?
-
-    respond_to do |format|
-      format.html { render :nothing => true }
-      format.api
-    end
-  end
-
-  def create
     @relation = IssueRelation.new(params[:relation])
     @relation.issue_from = @issue
-    if params[:relation] && m = params[:relation][:issue_to_id].to_s.strip.match(/^#?(\d+)$/)
+    @relation.save if request.post?
-      @relation.issue_to = Issue.visible.find_by_id(m[1].to_i)
-    end
-    saved = @relation.save
-
     respond_to do |format|
       format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
-      format.js {
+      format.js do
-        @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+        render :update do |page|
-      }
+          page.replace_html "relations", :partial => 'issues/relations'
-      format.api {
+          if @relation.errors.empty?
-        if saved
+            page << "$('relation_delay').value = ''"
-          render :action => 'show', :status => :created, :location => relation_url(@relation)
+            page << "$('relation_issue_to_id').value = ''"
-        else
+          end
-          render_validation_errors(@relation)
         end
-      }
+      end
     end
   end
   
   def destroy
-    raise Unauthorized unless @relation.deletable?
+    relation = IssueRelation.find(params[:id])
-    @relation.destroy
+    if request.post? && @issue.relations.include?(relation)
-
+      relation.destroy
+      @issue.reload
+    end
     respond_to do |format|
-      format.html { redirect_to issue_path } # TODO : does this really work since @issue is always nil? What is it useful to?
+      format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
-      format.js
+      format.js { render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'} }
-      format.api  { render_api_ok }
     end
   end
   
 private
-  def find_issue
+  def find_project
-    @issue = @object = Issue.find(params[:issue_id])
+    @issue = Issue.find(params[:issue_id])
-  rescue ActiveRecord::RecordNotFound
+    @project = @issue.project
-    render_404
-  end
-
-  def find_relation
-    @relation = IssueRelation.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     render_404
   end

app/controllers/issue_statuses_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,22 +16,20 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueStatusesController < ApplicationController
-  layout 'admin'
+  layout 'base'	
+  before_filter :require_admin
 
-  before_filter :require_admin, :except => :index
+  verify :method => :post, :only => [ :destroy, :create, :update, :move ],
-  before_filter :require_admin_or_api_request, :only => :index
+         :redirect_to => { :action => :list }
-  accept_api_auth :index
          
   def index
-    respond_to do |format|
+    list
-      format.html {
+    render :action => 'list' unless request.xhr?
-        @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 25, :order => "position"
+  end
-        render :action => "index", :layout => false if request.xhr?
+
-      }
+  def list
-      format.api {
+    @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 25, :order => "position"
-        @issue_statuses = IssueStatus.all(:order => 'position')
+    render :action => "list", :layout => false if request.xhr?
-      }
-    end
   end
 
   def new
@@ -40,9 +38,9 @@ class IssueStatusesController < ApplicationController
 
   def create
     @issue_status = IssueStatus.new(params[:issue_status])
-    if request.post? && @issue_status.save
+    if @issue_status.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list'
     else
       render :action => 'new'
     end
@@ -54,28 +52,34 @@ class IssueStatusesController < ApplicationController
 
   def update
     @issue_status = IssueStatus.find(params[:id])
-    if request.put? && @issue_status.update_attributes(params[:issue_status])
+    if @issue_status.update_attributes(params[:issue_status])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list'
     else
       render :action => 'edit'
     end
   end
   
-  def destroy
+  def move
-    IssueStatus.find(params[:id]).destroy
+    @issue_status = IssueStatus.find(params[:id])
-    redirect_to :action => 'index'
+    case params[:position]
-  rescue
+    when 'highest'
-    flash[:error] = l(:error_unable_delete_issue_status)
+      @issue_status.move_to_top
-    redirect_to :action => 'index'
+    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 update_issue_done_ratio
+  def destroy
-    if request.post? && IssueStatus.update_issue_done_ratios
+    IssueStatus.find(params[:id]).destroy
-      flash[:notice] = l(:notice_issue_done_ratios_updated)
+    redirect_to :action => 'list'
-    else
+  rescue
-      flash[:error] =  l(:error_issue_done_ratios_not_updated)
+    flash[:error] = "Unable to delete issue status"
-    end
+    redirect_to :action => 'list'
-    redirect_to :action => 'index'
   end  	
 end

app/controllers/issues_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,26 +16,23 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssuesController < ApplicationController
-  menu_item :new_issue, :only => [:new, :create]
+  layout 'base'
-  default_search_scope :issues
+  menu_item :new_issue, :only => :new
   
-  before_filter :find_issue, :only => [:show, :edit, :update]
+  before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
-  before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
+  before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
-  before_filter :find_project, :only => [:new, :create]
+  before_filter :find_project, :only => [:new, :update_form, :preview]
-  before_filter :authorize, :except => [:index]
+  before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
-  before_filter :find_optional_project, :only => [:index]
+  before_filter :find_optional_project, :only => [:index, :changes]
-  before_filter :check_for_default_issue_status, :only => [:new, :create]
+  accept_key_auth :index, :changes
-  before_filter :build_new_issue_from_params, :only => [:new, :create]
-  accept_rss_auth :index, :show
-  accept_api_auth :index, :show, :create, :update, :destroy
-
-  rescue_from Query::StatementInvalid, :with => :query_statement_invalid
 
   helper :journals
   helper :projects
   include ProjectsHelper   
   helper :custom_fields
   include CustomFieldsHelper
+  helper :ifpdf
+  include IfpdfHelper
   helper :issue_relations
   include IssueRelationsHelper
   helper :watchers
@@ -43,240 +40,252 @@ class IssuesController < ApplicationController
   helper :attachments
   include AttachmentsHelper
   helper :queries
-  include QueriesHelper
-  helper :repositories
-  include RepositoriesHelper
   helper :sort
   include SortHelper
   include IssuesHelper
   helper :timelog
-  include Redmine::Export::PDF
 
   def index
+    sort_init "#{Issue.table_name}.id", "desc"
+    sort_update
     retrieve_query
-    sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
-    sort_update(@query.sortable_columns)
-    @query.sort_criteria = sort_criteria.to_a
-
     if @query.valid?
-      case params[:format]
+      limit = per_page_option
-      when 'csv', 'pdf'
-        @limit = Setting.issues_export_limit.to_i
-      when 'atom'
-        @limit = Setting.feeds_limit.to_i
-      when 'xml', 'json'
-        @offset, @limit = api_offset_and_limit
-      else
-        @limit = per_page_option
-      end
-
-      @issue_count = @query.issue_count
-      @issue_pages = Paginator.new self, @issue_count, @limit, params['page']
-      @offset ||= @issue_pages.current.offset
-      @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
-                              :order => sort_clause,
-                              :offset => @offset,
-                              :limit => @limit)
-      @issue_count_by_group = @query.issue_count_by_group
-
       respond_to do |format|
-        format.html { render :template => 'issues/index', :layout => !request.xhr? }
+        format.html { }
-        format.api  {
+        format.atom { }
-          Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
+        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, @query, params), :type => 'text/csv; header=present', :filename => 'export.csv') }
+        format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
-        format.pdf  { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'export.pdf') }
+        format.pdf  { send_data(render(:template => 'issues/index.rfpdf', :layout => false), :type => 'application/pdf', :filename => 'export.pdf') }
       end
     else
-      respond_to do |format|
+      # Send html if the query is not valid
-        format.html { render(:template => 'issues/index', :layout => !request.xhr?) }
+      render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
-        format.any(:atom, :csv, :pdf) { render(:nothing => true) }
-        format.api { render_validation_errors(@query) }
-      end
     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.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
+    @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.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
     @journals.reverse! if User.current.wants_comments_in_reverse_order?
-
-    @changesets = @issue.changesets.visible.all
-    @changesets.reverse! if User.current.wants_comments_in_reverse_order?
-
-    @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
-    @priorities = IssuePriority.active
+    @priorities = Enumeration::get_values('IPRI')
-    @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
+    @time_entry = TimeEntry.new
     respond_to do |format|
-      format.html {
+      format.html { render :template => 'issues/show.rhtml' }
-        retrieve_previous_and_next_issue_ids
+      format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
-        render :template => 'issues/show'
+      format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
-      }
-      format.api
-      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
-      format.pdf  {
-        pdf = issue_to_pdf(@issue, :journals => @journals)
-        send_data(pdf, :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
-    respond_to do |format|
+    @issue = Issue.new
-      format.html { render :action => 'new', :layout => !request.xhr? }
+    @issue.copy_from(params[:copy_from]) if params[:copy_from]
-      format.js { render :partial => 'update_form' }
+    @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
   
-  def create
+  # Attributes that can be updated on workflow transition (without :edit permission)
-    call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
+  # TODO: make it configurable (at least per role)
-    @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
+  UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
-    if @issue.save
-      call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
-      respond_to do |format|
-        format.html {
-          render_attachment_warning_if_needed(@issue)
-          flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
-          redirect_to(params[:continue] ?  { :action => 'new', :project_id => @issue.project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
-                      { :action => 'show', :id => @issue })
-        }
-        format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }
-      end
-      return
-    else
-      respond_to do |format|
-        format.html { render :action => 'new' }
-        format.api  { render_validation_errors(@issue) }
-      end
-    end
-  end
   
   def edit
-    return unless update_issue_from_params
+    @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
     
-    respond_to do |format|
-      format.html { }
-      format.xml  { }
-    end
-  end
-
-  def update
-    return unless update_issue_from_params
-    @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
-    saved = false
-    begin
-      saved = @issue.save_issue_with_child_records(params, @time_entry)
-    rescue ActiveRecord::StaleObjectError
-      @conflict = true
-      if params[:last_journal_id]
-        @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
-        @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
-      end
-    end
-
-    if saved
-      render_attachment_warning_if_needed(@issue)
-      flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
-
-      respond_to do |format|
-        format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }
-        format.api  { render_api_ok }
-      end
-    else
-      respond_to do |format|
-        format.html { render :action => 'edit' }
-        format.api  { render_validation_errors(@issue) }
-      end
-    end
-  end
-
-  # Bulk edit/copy a set of issues
-  def bulk_edit
-    @issues.sort!
-    @copy = params[:copy].present?
     @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 User.current.allowed_to?(:move_issues, @projects)
+    if request.post?
-      @allowed_projects = Issue.allowed_target_projects_on_move
+      @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
-      if params[:issue]
+      @time_entry.attributes = params[:time_entry]
-        @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
+      attachments = attach_files(@issue, params[:attachments])
-        if @target_project
+      attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
-          target_projects = [@target_project]
+      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?
+
+        Redmine::Plugin::Hook::Manager.call_hook(:issue_bulk_edit_save, {:params => params, :issue => issue })
+
+        # 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
-    target_projects ||= @projects
+    # Find potential statuses the user could be allowed to switch issues to
-
+    @available_statuses = Workflow.find(:all, :include => :new_status,
-    if @copy
+                                              :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
-      @available_statuses = [IssueStatus.default]
-    else
-      @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
-    end
-    @custom_fields = target_projects.map{|p|p.all_issue_custom_fields}.reduce(:&)
-    @assignables = target_projects.map(&:assignable_users).reduce(:&)
-    @trackers = target_projects.map(&:trackers).reduce(:&)
-    @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
-    @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
-    if @copy
-      @attachments_present = @issues.detect {|i| i.attachments.any?}.present?
-      @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
-    end
-
-    @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
-    render :layout => false if request.xhr?
   end
 
-  def bulk_update
+  def move
-    @issues.sort!
+    @allowed_projects = []
-    @copy = params[:copy].present?
+    # find projects to which the user is allowed to move the issue
-    attributes = parse_params_for_bulk_issue_attributes(params)
+    if User.current.admin?
-
+      # admin is allowed to move issues to any active (visible) project
-    unsaved_issue_ids = []
+      @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
-    moved_issues = []
-
-    if @copy && params[:copy_subtasks].present?
-      # Descendant issues will be copied with the parent task
-      # Don't copy them twice
-      @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
-    end
-
-    @issues.each do |issue|
-      issue.reload
-      if @copy
-        issue = issue.copy({},
-          :attachments => params[:copy_attachments].present?,
-          :subtasks => params[:copy_subtasks].present?
-        )
-      end
-      journal = issue.init_journal(User.current, params[:notes])
-      issue.safe_attributes = attributes
-      call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
-      if issue.save
-        moved_issues << issue
-      else
-        # Keep unsaved issue ids to display them in flash error
-        unsaved_issue_ids << issue.id
-      end
-    end
-    set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
-
-    if params[:follow]
-      if @issues.size == 1 && moved_issues.size == 1
-        redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first
-      elsif moved_issues.map(&:project).uniq.size == 1
-        redirect_to :controller => 'issues', :action => 'index', :project_id => moved_issues.map(&:project).first
-      end
     else
-      redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
+      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
@@ -296,136 +305,128 @@ class IssuesController < ApplicationController
           TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
         end
       else
-        # display the destroy form if it's a user request
+        # display the destroy form
-        return unless api_request?
+        return
       end
     end
-    @issues.each do |issue|
+    @issues.each(&:destroy)
-      begin
+    redirect_to :action => 'index', :project_id => @project
-        issue.reload.destroy
-      rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
-        # nothing to do, issue was already deleted (eg. by a parent)
-      end
-    end
-    respond_to do |format|
-      format.html { redirect_back_or_default(:action => 'index', :project_id => @project) }
-      format.api  { render_api_ok }
-    end
   end
 
-  private
+  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 find_project
+  def context_menu
-    project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
+    @issues = Issue.find_all_by_id(params[:ids], :include => :project)
-    @project = Project.find(project_id)
+    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
   
-  def retrieve_previous_and_next_issue_ids
+  # Filter for bulk operations
-    retrieve_query_from_session
+  def find_issues
-    if @query
+    @issues = Issue.find_all_by_id(params[:id] || params[:ids])
-      sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
+    raise ActiveRecord::RecordNotFound if @issues.empty?
-      sort_update(@query.sortable_columns, 'issues_index_sort')
+    projects = @issues.collect(&:project).compact.uniq
-      limit = 500
+    if projects.size == 1
-      issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
+      @project = projects.first
-      if (idx = issue_ids.index(@issue.id)) && idx < limit
-        if issue_ids.size < 500
-          @issue_position = idx + 1
-          @issue_count = issue_ids.size
-        end
-        @prev_issue_id = issue_ids[idx - 1] if idx > 0
-        @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
-      end
-    end
-  end
-
-  # Used by #edit and #update to set some common instance variables
-  # from the params
-  # TODO: Refactor, not everything in here is needed by #edit
-  def update_issue_from_params
-    @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
-    @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
-    @time_entry.attributes = params[:time_entry]
-
-    @issue.init_journal(User.current)
-
-    issue_attributes = params[:issue]
-    if issue_attributes && params[:conflict_resolution]
-      case params[:conflict_resolution]
-      when 'overwrite'
-        issue_attributes = issue_attributes.dup
-        issue_attributes.delete(:lock_version)
-      when 'add_notes'
-        issue_attributes = issue_attributes.slice(:notes)
-      when 'cancel'
-        redirect_to issue_path(@issue)
-        return false
-      end
-    end
-    @issue.safe_attributes = issue_attributes
-    @priorities = IssuePriority.active
-    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
-    true
-  end
-
-  # TODO: Refactor, lots of extra code in here
-  # TODO: Changing tracker on an existing issue should not trigger this
-  def build_new_issue_from_params
-    if params[:id].blank?
-      @issue = Issue.new
-      if params[:copy_from]
-        begin
-          @copy_from = Issue.visible.find(params[:copy_from])
-          @copy_attachments = params[:copy_attachments].present? || request.get?
-          @copy_subtasks = params[:copy_subtasks].present? || request.get?
-          @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks)
-        rescue ActiveRecord::RecordNotFound
-          render_404
-          return
-        end
-      end
-      @issue.project = @project
     else
-      @issue = @project.issues.visible.find(params[:id])
+      # 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
-    @issue.project = @project
+    render_404
-    @issue.author ||= User.current
-    # 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?
-      render_error l(:error_no_tracker_in_project)
-      return false
-    end
-    @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
-    @issue.safe_attributes = params[:issue]
-
-    @priorities = IssuePriority.active
-    @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
-    @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
   end
   
-  def check_for_default_issue_status
+  def find_project
-    if IssueStatus.default.nil?
+    @project = Project.find(params[:project_id])
-      render_error l(:error_no_default_issue_status)
+  rescue ActiveRecord::RecordNotFound
-      return false
+    render_404
-    end
   end
   
-  def parse_params_for_bulk_issue_attributes(params)
+  def find_optional_project
-    attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
+    return true unless params[:project_id]
-    attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
+    @project = Project.find(params[:project_id])
-    if custom = attributes[:custom_field_values]
+    authorize
-      custom.reject! {|k,v| v.blank?}
+  rescue ActiveRecord::RecordNotFound
-      custom.keys.each do |k|
+    render_404
-        if custom[k].is_a?(Array)
+  end
-          custom[k] << '' if custom[k].delete('__none__')
+  
+  # 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
-          custom[k] = '' if custom[k] == '__none__'
+          @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
-    attributes
   end
 end

app/controllers/journals_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,88 +16,24 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class JournalsController < ApplicationController
-  before_filter :find_journal, :only => [:edit, :diff]
+  layout 'base'
-  before_filter :find_issue, :only => [:new]
+  before_filter :find_journal
-  before_filter :find_optional_project, :only => [:index]
-  before_filter :authorize, :only => [:new, :edit, :diff]
-  accept_rss_auth :index
-  menu_item :issues
-
-  helper :issues
-  helper :custom_fields
-  helper :queries
-  include QueriesHelper
-  helper :sort
-  include SortHelper
-
-  def index
-    retrieve_query
-    sort_init 'id', 'desc'
-    sort_update(@query.sortable_columns)
-
-    if @query.valid?
-      @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
-                                  :limit => 25)
-    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 diff
-    @issue = @journal.issue
-    if params[:detail_id].present?
-      @detail = @journal.details.find_by_id(params[:detail_id])
-    else
-      @detail = @journal.details.detect {|d| d.prop_key == 'description'}
-    end
-    (render_404; return false) unless @issue && @detail
-    @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
-  end
-
-  def new
-    @journal = Journal.visible.find(params[:journal_id]) if params[:journal_id]
-    if @journal
-      user = @journal.user
-      text = @journal.notes
-    else
-      user = @issue.author
-      text = @issue.description
-    end
-    # Replaces pre blocks with [...]
-    text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
-    @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
-    @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
   
   def edit
-    (render_403; return false) unless @journal.editable_by?(User.current)
     if request.post?
       @journal.update_attributes(:notes => params[:notes]) if params[:notes]
       @journal.destroy if @journal.details.empty? && @journal.notes.blank?
-      call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
       respond_to do |format|
         format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
         format.js { render :action => 'update' }
       end
-    else
-      respond_to do |format|
-        format.html {
-          # TODO: implement non-JS journal update
-          render :nothing => true
-        }
-        format.js
-      end
     end
   end
   
-  private
+private
-
   def find_journal
-    @journal = Journal.visible.find(params[:id])
+    @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

app/controllers/mail_handler_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -18,6 +18,10 @@
 class MailHandlerController < ActionController::Base
   before_filter :check_credential
   
+  verify :method => :post,
+         :only => :index,
+         :render => { :nothing => true, :status => 405 }
+         
   # Submits an incoming email to MailHandler
   def index
     options = params.dup
@@ -33,8 +37,8 @@ class MailHandlerController < ActionController::Base
   
   def check_credential
     User.current = nil
-    unless Setting.mail_handler_api_enabled? && params[:key].to_s == Setting.mail_handler_api_key
+    unless Setting.mail_handler_api_enabled? && params[:key] == Setting.mail_handler_api_key
-      render :text => 'Access denied. Incoming emails WS is disabled or key is invalid.', :status => 403
+      render :nothing => true, :status => 403
     end
   end
 end

app/controllers/members_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,103 +16,47 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MembersController < ApplicationController
-  model_object Member
+  layout 'base'
-  before_filter :find_model_object, :except => [:index, :create, :autocomplete]
+  before_filter :find_member, :except => :new
-  before_filter :find_project_from_association, :except => [:index, :create, :autocomplete]
+  before_filter :find_project, :only => :new
-  before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
   before_filter :authorize
-  accept_api_auth :index, :show, :create, :update, :destroy
-
-  def index
-    @offset, @limit = api_offset_and_limit
-    @member_count = @project.member_principals.count
-    @member_pages = Paginator.new self, @member_count, @limit, params['page']
-    @offset ||= @member_pages.current.offset
-    @members =  @project.member_principals.all(
-      :order => "#{Member.table_name}.id",
-      :limit  =>  @limit,
-      :offset =>  @offset
-    )
 
+  def new
+    @project.members << Member.new(params[:member]) if request.post?
     respond_to do |format|
-      format.html { head 406 }
+      format.html { redirect_to :action => 'settings', :tab => 'members', :id => @project }
-      format.api
+      format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
     end
   end
   
-  def show
+  def edit
-    respond_to do |format|
+    if request.post? and @member.update_attributes(params[:member])
-      format.html { head 406 }
+  	 respond_to do |format|
-      format.api
+        format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-    end
+        format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
-  end
-
-  def create
-    members = []
-    if params[:membership]
-      if params[:membership][:user_ids]
-        attrs = params[:membership].dup
-        user_ids = attrs.delete(:user_ids)
-        user_ids.each do |user_id|
-          members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
-        end
-      else
-        members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
       end
-      @project.members << members
-    end
-
-    respond_to do |format|
-      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-      format.js { @members = members }
-      format.api {
-        @member = members.first
-        if @member.valid?
-          render :action => 'show', :status => :created, :location => membership_url(@member)
-        else
-          render_validation_errors(@member)
-        end
-      }
-    end
-  end
-
-  def update
-    if params[:membership]
-      @member.role_ids = params[:membership][:role_ids]
-    end
-    saved = @member.save
-    respond_to do |format|
-      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-      format.js
-      format.api {
-        if saved
-          render_api_ok
-        else
-          render_validation_errors(@member)
-        end
-      }
     end
   end
 
   def destroy
-    if request.delete? && @member.deletable?
+    @member.destroy
-      @member.destroy
+	respond_to do |format|
-    end
-    respond_to do |format|
       format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-      format.js
+      format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
-      format.api {
-        if @member.destroyed?
-          render_api_ok
-        else
-          head :unprocessable_entity
-        end
-      }
     end
   end
 
-  def autocomplete
+private
-    @principals = Principal.active.not_member_of(@project).like(params[:q]).all(:limit => 100)
+  def find_project
-    render :layout => false
+    @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

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,108 +16,77 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MessagesController < ApplicationController
+  layout 'base'
   menu_item :boards
-  default_search_scope :messages
   before_filter :find_board, :only => [:new, :preview]
   before_filter :find_message, :except => [:new, :preview]
-  before_filter :authorize, :except => [:preview, :edit, :destroy]
+  before_filter :authorize, :except => :preview
+
+  verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
 
-  helper :boards
-  helper :watchers
   helper :attachments
   include AttachmentsHelper   
 
-  REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
-
   # Show a topic and its replies
   def show
-    page = params[:page]
+    @replies = @topic.children
-    # Find the page of the requested reply
+    @replies.reverse! if User.current.wants_comments_in_reverse_order?
-    if params[:r] && page.nil?
-      offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
-      page = 1 + offset / REPLIES_PER_PAGE
-    end
-
-    @reply_count = @topic.children.count
-    @reply_pages = Paginator.new self, @reply_count, REPLIES_PER_PAGE, page
-    @replies =  @topic.children.find(:all, :include => [:author, :attachments, {:board => :project}],
-                                           :order => "#{Message.table_name}.created_on ASC",
-                                           :limit => @reply_pages.items_per_page,
-                                           :offset => @reply_pages.current.offset)
-
     @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
+    @message = Message.new(params[:message])
     @message.author = User.current
     @message.board = @board
-    @message.safe_attributes = params[:message]
+    if params[:message] && User.current.allowed_to?(:edit_messages, @project)
-    if request.post?
+      @message.locked = params[:message]['locked']
-      @message.save_attachments(params[:attachments])
+      @message.sticky = params[:message]['sticky']
-      if @message.save
+    end
-        call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
+    if request.post? && @message.save
-        render_attachment_warning_if_needed(@message)
+      attach_files(@message, params[:attachments])
-        redirect_to board_message_path(@board, @message)
+      redirect_to :action => 'show', :id => @message
-      end
     end
   end
 
   # Reply to a topic
   def reply
-    @reply = Message.new
+    @reply = Message.new(params[:reply])
     @reply.author = User.current
     @reply.board = @board
-    @reply.safe_attributes = params[:reply]
     @topic.children << @reply
     if !@reply.new_record?
-      call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
+      attach_files(@reply, params[:attachments])
-      attachments = Attachment.attach_files(@reply, params[:attachments])
-      render_attachment_warning_if_needed(@reply)
     end
-    redirect_to board_message_path(@board, @topic, :r => @reply)
+    redirect_to :action => 'show', :id => @topic
   end
 
   # Edit a message
   def edit
-    (render_403; return false) unless @message.editable_by?(User.current)
+    if params[:message] && User.current.allowed_to?(:edit_messages, @project)
-    @message.safe_attributes = params[:message]
+      @message.locked = params[:message]['locked']
-    if request.post? && @message.save
+      @message.sticky = params[:message]['sticky']
-      attachments = Attachment.attach_files(@message, params[:attachments])
+    end
-      render_attachment_warning_if_needed(@message)
+    if request.post? && @message.update_attributes(params[:message])
+      attach_files(@message, params[:attachments])
       flash[:notice] = l(:notice_successful_update)
-      @message.reload
+      redirect_to :action => 'show', :id => @topic
-      redirect_to board_message_path(@message.board, @message.root, :r => (@message.parent_id && @message.id))
     end
   end
   
   # Delete a messages
   def destroy
-    (render_403; return false) unless @message.destroyable_by?(User.current)
-    r = @message.to_param
     @message.destroy
-    if @message.parent
+    redirect_to @message.parent.nil? ?
-      redirect_to board_message_path(@board, @message.parent, :r => r)
+      { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
-    else
+      { :action => 'show', :id => @message.parent }
-      redirect_to project_board_path(@project, @board)
-    end
-  end
-
-  def quote
-    @subject = @message.subject
-    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
-
-    @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
-    @content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
   end
   
   def preview
     message = @board.messages.find_by_id(params[:id])
     @attachements = message.attachments if message
     @text = (params[:message] || params[:reply])[:content]
-    @previewed = message
     render :partial => 'common/preview'
   end
   

app/controllers/my_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,11 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MyController < ApplicationController
-  before_filter :require_login
-
   helper :issues
-  helper :users
+  
-  helper :custom_fields
+  layout 'base'
+  before_filter :require_login
 
   BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
              'issuesreportedbyme' => :label_reported_issues,
@@ -29,12 +28,16 @@ class MyController < ApplicationController
              'calendar' => :label_calendar,
              'documents' => :label_document_plural,
              'timelog' => :label_spent_time
-           }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
+           }.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'
@@ -51,46 +54,31 @@ class MyController < ApplicationController
     @user = User.current
     @pref = @user.pref
     if request.post?
-      @user.safe_attributes = params[:user]
+      @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 = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
+        @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
-  end
+    @notification_options = [[l(:label_user_mail_option_all), 'all'],
-
+                             [l(:label_user_mail_option_none), 'none']]
-  # Destroys user's account
+    # Only users that belong to more than 1 project can select projects for which they are notified
-  def destroy
+    # Note that @user.membership.size would fail since AR ignores :include association option when doing a count
-    @user = User.current
+    @notification_options.insert 1, [l(:label_user_mail_option_selected), 'selected'] if @user.memberships.length > 1
-    unless @user.own_account_deletable?
+    @notification_option = @user.mail_notification? ? 'all' : (@user.notified_projects_ids.empty? ? 'none' : 'selected')    
-      redirect_to :action => 'account'
-      return
-    end
-
-    if request.post? && params[:confirm]
-      @user.destroy
-      if @user.destroyed?
-        logout_user
-        flash[:notice] = l(:notice_account_deleted)
-      end
-      redirect_to home_path
-    end
   end
 
   # Manage user's password
   def password
     @user = User.current
-    unless @user.change_password_allowed?
+    flash[:error] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
-      flash[:error] = l(:notice_can_t_change_password)
-      redirect_to :action => 'account'
-      return
-    end
     if request.post?
       if @user.check_password?(params[:password])
         @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
@@ -106,71 +94,44 @@ class MyController < ApplicationController
   
   # Create a new feeds key
   def reset_rss_key
-    if request.post?
+    if request.post? && User.current.rss_token
-      if User.current.rss_token
+      User.current.rss_token.destroy
-        User.current.rss_token.destroy
-        User.current.reload
-      end
-      User.current.rss_key
       flash[:notice] = l(:notice_feeds_access_key_reseted)
     end
     redirect_to :action => 'account'
   end
 
-  # Create a new API key
-  def reset_api_key
-    if request.post?
-      if User.current.api_token
-        User.current.api_token.destroy
-        User.current.reload
-      end
-      User.current.api_key
-      flash[:notice] = l(:notice_api_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 do |k, v|
+    BLOCKS.each {|k, v| @block_options << [l(v), k]}
-      unless %w(top left right).detect {|f| (@blocks[f] ||= []).include?(k)}
-        @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]
-      end
-    end
   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].to_s.underscore
+    block = params[:block]
-    if block.present? && BLOCKS.key?(block)
+    render(:nothing => true) and return unless block && (BLOCKS.keys.include? block)
-      @user = User.current
+    @user = User.current
-      layout = @user.pref[:my_page_layout] || {}
+    # remove if already present in a group
-      # remove if already present in a group
+    %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
-      %w(top left right).each {|f| (layout[f] ||= []).delete block }
+    # add it on top
-      # add it on top
+    session[:page_layout]['top'].unshift block
-      layout['top'].unshift block
+    render :partial => "block", :locals => {:user => @user, :block_name => block}
-      @user.pref[:my_page_layout] = layout
-      @user.pref.save
-    end
-    redirect_to :action => 'page_layout'
   end
   
   # Remove a block to user's page
   # params[:block] : id of the block to remove
   def remove_block
-    block = params[:block].to_s.underscore
+    block = params[:block]
-    @user = User.current
     # remove block in all groups
-    layout = @user.pref[:my_page_layout] || {}
+    %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
-    %w(top left right).each {|f| (layout[f] ||= []).delete block }
+    render :nothing => true
-    @user.pref[:my_page_layout] = layout
-    @user.pref.save
-    redirect_to :action => 'page_layout'
   end
 
   # Change blocks order on user's page
@@ -178,21 +139,23 @@ class MyController < ApplicationController
   # params[:list-(top|left|right)] : array of block ids of the group
   def order_blocks
     group = params[:group]
-    @user = User.current
+    group_items = params["list-#{group}"]
-    if group.is_a?(String)
+    if group_items and group_items.is_a? Array
-      group_items = (params["blocks"] || []).collect(&:underscore)
+      # remove group blocks if they are presents in other groups
-      group_items.each {|s| s.sub!(/^block_/, '')}
+      %w(top left right).each {|f|
-      if group_items and group_items.is_a? Array
+        session[:page_layout][f] = (session[:page_layout][f] || []) - group_items
-        layout = @user.pref[:my_page_layout] || {}
+      }
-        # remove group blocks if they are presents in other groups
+      session[:page_layout][group] = group_items    
-        %w(top left right).each {|f|
-          layout[f] = (layout[f] || []) - group_items
-        }
-        layout[group] = group_items
-        @user.pref[:my_page_layout] = layout
-        @user.pref.save
-      end
     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

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,43 +16,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class NewsController < ApplicationController
-  default_search_scope :news
+  layout 'base'
-  model_object News
+  before_filter :find_news, :except => [:new, :index, :preview]
-  before_filter :find_model_object, :except => [:new, :create, :index]
+  before_filter :find_project, :only => [:new, :preview]
-  before_filter :find_project_from_association, :except => [:new, :create, :index]
+  before_filter :authorize, :except => [:index, :preview]
-  before_filter :find_project_by_project_id, :only => [:new, :create]
-  before_filter :authorize, :except => [:index]
   before_filter :find_optional_project, :only => :index
-  accept_rss_auth :index
+  accept_key_auth :index
-  accept_api_auth :index
-
-  helper :watchers
-  helper :attachments
   
   def index
-    case params[:format]
+    @news_pages, @newss = paginate :news,
-    when 'xml', 'json'
+                                   :per_page => 10,
-      @offset, @limit = api_offset_and_limit
+                                   :conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
-    else
+                                   :include => [:author, :project],
-      @limit =  10
+                                   :order => "#{News.table_name}.created_on DESC"    
-    end
-
-    scope = @project ? @project.news.visible : News.visible
-
-    @news_count = scope.count
-    @news_pages = Paginator.new self, @news_count, @limit, params['page']
-    @offset ||= @news_pages.current.offset
-    @newss = scope.all(:include => [:author, :project],
-                                       :order => "#{News.table_name}.created_on DESC",
-                                       :offset => @offset,
-                                       :limit => @limit)
-
     respond_to do |format|
-      format.html {
+      format.html { render :layout => false if request.xhr? }
-        @news = News.new # for adding news inline
-        render :layout => false if request.xhr?
-      }
-      format.api
       format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
     end
   end
@@ -64,42 +42,62 @@ class NewsController < ApplicationController
 
   def new
     @news = News.new(:project => @project, :author => User.current)
-  end
+    if request.post?
-
+      @news.attributes = params[:news]
-  def create
+      if @news.save
-    @news = News.new(:project => @project, :author => User.current)
+        flash[:notice] = l(:notice_successful_create)
-    @news.safe_attributes = params[:news]
+        Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
-    @news.save_attachments(params[:attachments])
+        redirect_to :controller => 'news', :action => 'index', :project_id => @project
-    if @news.save
+      end
-      render_attachment_warning_if_needed(@news)
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to :controller => 'news', :action => 'index', :project_id => @project
-    else
-      render :action => 'new'
     end
   end
   
   def edit
-  end
+    if request.post? and @news.update_attributes(params[:news])
-
-  def update
-    @news.safe_attributes = params[:news]
-    @news.save_attachments(params[:attachments])
-    if @news.save
-      render_attachment_warning_if_needed(@news)
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'show', :id => @news
-    else
-      render :action => 'edit'
     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
   
-  private
+  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]

app/controllers/previews_controller.rb

@@ -1,55 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 PreviewsController < ApplicationController
-  before_filter :find_project
-
-  def issue
-    @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
-    if @issue
-      @attachements = @issue.attachments
-      @description = params[:issue] && params[:issue][:description]
-      if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
-        @description = nil
-      end
-      # params[:notes] is useful for preview of notes in issue history
-      @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil)
-    else
-      @description = (params[:issue] ? params[:issue][:description] : nil)
-    end
-    render :layout => false
-  end
-
-  def news
-    if params[:id].present? && news = News.visible.find_by_id(params[:id])
-      @previewed = news
-      @attachments = news.attachments
-    end
-    @text = (params[:news] ? params[:news][:description] : nil)
-    render :partial => 'common/preview'
-  end
-
-  private
-
-  def find_project
-    project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
-    @project = Project.find(project_id)
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-end

app/controllers/project_enumerations_controller.rb

@@ -1,43 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 ProjectEnumerationsController < ApplicationController
-  before_filter :find_project_by_project_id
-  before_filter :authorize
-
-  def update
-    if request.put? && params[:enumerations]
-      Project.transaction do
-        params[:enumerations].each do |id, activity|
-          @project.update_or_create_time_entry_activity(id, activity)
-        end
-      end
-      flash[:notice] = l(:notice_successful_update)
-    end
-
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
-  end
-
-  def destroy
-    @project.time_entry_activities.each do |time_entry_activity|
-      time_entry_activity.destroy(time_entry_activity.parent)
-    end
-    flash[:notice] = l(:notice_successful_update)
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
-  end
-
-end

app/controllers/projects_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,28 +16,28 @@
 # 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, :new, :create, :copy ]
+  before_filter :find_project, :except => [ :index, :list, :add, :activity ]
-  before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
+  before_filter :find_optional_project, :only => :activity
-  before_filter :authorize_global, :only => [:new, :create]
+  before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy, :activity ]
-  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
+  before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
-  accept_rss_auth :index
+  accept_key_auth :activity, :calendar
-  accept_api_auth :index, :show, :create, :update, :destroy
-
-  after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
-    if controller.request.post?
-      controller.send :expire_action, :controller => 'welcome', :action => 'robots'
-    end
-  end
   
   helper :sort
   include SortHelper
   helper :custom_fields
   include CustomFieldsHelper   
+  helper :ifpdf
+  include IfpdfHelper
   helper :issues
+  helper IssuesHelper
   helper :queries
   include QueriesHelper
   helper :repositories
@@ -46,219 +46,320 @@ class ProjectsController < ApplicationController
   
   # Lists visible projects
   def index
+    projects = Project.find :all,
+                            :conditions => Project.visible_by(User.current),
+                            :include => :parent
     respond_to do |format|
       format.html { 
-        scope = Project
+        @project_tree = projects.group_by {|p| p.parent || p}
-        unless params[:closed]
+        @project_tree.keys.each {|p| @project_tree[p] -= [p]} 
-          scope = scope.active
-        end
-        @projects = scope.visible.order('lft').all
-      }
-      format.api  {
-        @offset, @limit = api_offset_and_limit
-        @project_count = Project.visible.count
-        @projects = Project.visible.all(:offset => @offset, :limit => @limit, :order => 'lft')
       }
       format.atom {
-        projects = Project.visible.find(:all, :order => 'created_on DESC',
+        render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i), 
-                                              :limit => Setting.feeds_limit.to_i)
+                                  :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
-        render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
       }
     end
   end
   
-  def new
+  # Add a new project
+  def add
     @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
-    @trackers = Tracker.sorted.all
+    @trackers = Tracker.all
-    @project = Project.new
-    @project.safe_attributes = params[:project]
-  end
-
-  def create
-    @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
-    @trackers = Tracker.sorted.all
-    @project = Project.new
-    @project.safe_attributes = params[:project]
-
-    if validate_parent_id && @project.save
-      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
-      # Add current user as a project member if he is not admin
-      unless User.current.admin?
-        r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
-        m = Member.new(:user => User.current, :roles => [r])
-        @project.members << m
-      end
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_successful_create)
-          redirect_to(params[:continue] ?
-            {:controller => 'projects', :action => 'new', :project => {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}} :
-            {:controller => 'projects', :action => 'settings', :id => @project}
-          )
-        }
-        format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
-      end
-    else
-      respond_to do |format|
-        format.html { render :action => 'new' }
-        format.api  { render_validation_errors(@project) }
-      end
-    end
-
-  end
-
-  def copy
-    @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
-    @trackers = Tracker.sorted.all
     @root_projects = Project.find(:all,
                                   :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                   :order => 'name')
-    @source_project = Project.find(params[:id])
+    @project = Project.new(params[:project])
     if request.get?
-      @project = Project.copy_from(@source_project)
+      @project.trackers = Tracker.all
-      @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
+      @project.is_public = Setting.default_projects_public?
+      @project.enabled_module_names = Redmine::AccessControl.available_project_modules
     else
-      Mailer.with_deliveries(params[:notifications] == '1') do
+      @project.enabled_module_names = params[:enabled_modules]
-        @project = Project.new
+      if @project.save
-        @project.safe_attributes = params[:project]
+        flash[:notice] = l(:notice_successful_create)
-        if validate_parent_id && @project.copy(@source_project, :only => params[:only])
+        redirect_to :controller => 'admin', :action => 'projects'
-          @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
+	  end		
-          flash[:notice] = l(:notice_successful_create)
-          redirect_to :controller => 'projects', :action => 'settings', :id => @project
-        elsif !@project.new_record?
-          # Project was created
-          # But some objects were not copied due to validation failures
-          # (eg. issues from disabled trackers)
-          # TODO: inform about that
-          redirect_to :controller => 'projects', :action => 'settings', :id => @project
-        end
-      end
     end	
-  rescue ActiveRecord::RecordNotFound
-    # source_project not found
-    render_404
   end
 	
   # Show @project
   def show
-    if params[:jump]
+    @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
-      # try to redirect to the requested menu item
+    @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
-      redirect_to_project_menu_item(@project, params[:jump]) && return
-    end
-
-    @users_by_role = @project.users_by_role
-    @subprojects = @project.children.visible.all
     @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.visible.open.where(cond).count(:group => :tracker)
+      @open_issues_by_tracker = Issue.count(:group => :tracker,
-    @total_issues_by_tracker = Issue.visible.where(cond).count(:group => :tracker)
+                                            :include => [:project, :status, :tracker],
-
+                                            :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
-    if User.current.allowed_to?(:view_time_entries, @project)
+      @total_issues_by_tracker = Issue.count(:group => :tracker,
-      @total_hours = TimeEntry.visible.sum(:hours, :include => :project, :conditions => cond).to_f
+                                            :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
-
-    respond_to do |format|
-      format.html
-      format.api
-    end
   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.sorted.all
+    @trackers = Tracker.all
+    @repository ||= @project.repository
     @wiki ||= @project.wiki
   end
   
+  # Edit @project
   def edit
-  end
+    if request.post?
-
+      @project.attributes = params[:project]
-  def update
+      if @project.save
-    @project.safe_attributes = params[:project]
+        flash[:notice] = l(:notice_successful_update)
-    if validate_parent_id && @project.save
+        redirect_to :action => 'settings', :id => @project
-      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
+      else
-      respond_to do |format|
+        settings
-        format.html {
+        render :action => 'settings'
-          flash[:notice] = l(:notice_successful_update)
-          redirect_to :action => 'settings', :id => @project
-        }
-        format.api  { render_api_ok }
-      end
-    else
-      respond_to do |format|
-        format.html {
-          settings
-          render :action => 'settings'
-        }
-        format.api  { render_validation_errors(@project) }
       end
     end
   end
   
   def modules
-    @project.enabled_module_names = params[:enabled_module_names]
+    @project.enabled_module_names = params[:enabled_modules]
-    flash[:notice] = l(:notice_successful_update)
     redirect_to :action => 'settings', :id => @project, :tab => 'modules'
   end
 
   def archive
-    if request.post?
+    @project.archive if request.post? && @project.active?
-      unless @project.archive
+    redirect_to :controller => 'admin', :action => 'projects'
-        flash[:error] = l(:error_can_not_archive_project)
-      end
-    end
-    redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
   end
   
   def unarchive
     @project.unarchive if request.post? && !@project.active?
-    redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
+    redirect_to :controller => 'admin', :action => 'projects'
-  end
-
-  def close
-    @project.close
-    redirect_to project_path(@project)
-  end
-
-  def reopen
-    @project.reopen
-    redirect_to project_path(@project)
   end
   
   # Delete @project
   def destroy
     @project_to_destroy = @project
-    if api_request? || params[:confirm]
+    if request.post? and params[:confirm]
       @project_to_destroy.destroy
-      respond_to do |format|
+      redirect_to :controller => 'admin', :action => 'projects'
-        format.html { redirect_to :controller => 'admin', :action => 'projects' }
-        format.api  { render_api_ok }
-      end
     end
     # hide project in layout
     @project = nil
   end
 	
-  private
+  # Add a new issue category to @project
-
+  def add_issue_category
-  # Validates parent_id param according to user's permissions
+    @category = @project.issue_categories.build(params[:category])
-  # TODO: move it to Project model in a validation that depends on User.current
+    if request.post? and @category.save
-  def validate_parent_id
+  	  respond_to do |format|
-    return true if User.current.admin?
+        format.html do
-    parent_id = params[:project] && params[:project][:parent_id]
+          flash[:notice] = l(:notice_successful_create)
-    if parent_id || @project.new_record?
+          redirect_to :action => 'settings', :tab => 'categories', :id => @project
-      parent = parent_id.blank? ? nil : Project.find_by_id(parent_id.to_i)
+        end
-      unless @project.allowed_parents.include?(parent)
+        format.js do
-        @project.errors.add :parent_id, :invalid
+          # IE doesn't support the replace_html rjs method for select box options
-        return false
+          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
-    true
+  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 = (@scope.size == 1) ? l("label_#{@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

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,76 +16,50 @@
 # 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, :create, :index]
+  before_filter :find_query, :except => :new
-  before_filter :find_optional_project, :only => [:new, :create]
+  before_filter :find_optional_project, :only => :new
-
-  accept_api_auth :index
-
-  include QueriesHelper
-
-  def index
-    case params[:format]
-    when 'xml', 'json'
-      @offset, @limit = api_offset_and_limit
-    else
-      @limit = per_page_option
-    end
-
-    @query_count = Query.visible.count
-    @query_pages = Paginator.new self, @query_count, @limit, params['page']
-    @queries = Query.visible.all(:limit => @limit, :offset => @offset, :order => "#{Query.table_name}.name")
-
-    respond_to do |format|
-      format.html { render :nothing => true }
-      format.api
-    end
-  end
   
   def new
-    @query = Query.new
-    @query.user = User.current
-    @query.project = @project
-    @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
-    build_query_from_params
-  end
-
-  def create
     @query = Query.new(params[:query])
-    @query.user = User.current
     @query.project = params[:query_is_for_all] ? nil : @project
-    @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
+    @query.user = User.current
-    build_query_from_params
+    @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
+    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
-    else
+      return
-      render :action => 'new', :layout => !request.xhr?
     end
+    render :layout => false if request.xhr?
   end
   
   def edit
-  end
+    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]
       
-  def update
+      if @query.save
-    @query.attributes = params[:query]
+        flash[:notice] = l(:notice_successful_update)
-    @query.project = nil if params[:query_is_for_all]
+        redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
-    @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
+      end
-    build_query_from_params
-    @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
-    else
-      render :action => 'edit'
     end
   end
 
   def destroy
-    @query.destroy
+    @query.destroy if request.post?
     redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1
   end
   
@@ -100,7 +74,7 @@ private
   
   def find_optional_project
     @project = Project.find(params[:project_id]) if params[:project_id]
-    render_403 unless User.current.allowed_to?(:save_queries, @project, :global => true)
+    User.current.allowed_to?(:save_queries, @project, :global => true)
   rescue ActiveRecord::RecordNotFound
     render_404
   end

app/controllers/reports_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,80 +16,222 @@
 # 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, :find_issue_statuses
+  before_filter :find_project, :authorize
 
   def issue_report
-    @trackers = @project.trackers
+    @statuses = IssueStatus.find(:all, :order => 'position')
-    @versions = @project.shared_versions.sort
-    @priorities = IssuePriority.all.reverse
-    @categories = @project.issue_categories
-    @assignees = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort
-    @authors = @project.users.sort
-    @subprojects = @project.descendants.visible
     
-    @issues_by_tracker = Issue.by_tracker(@project)
-    @issues_by_version = Issue.by_version(@project)
-    @issues_by_priority = Issue.by_priority(@project)
-    @issues_by_category = Issue.by_category(@project)
-    @issues_by_assigned_to = Issue.by_assigned_to(@project)
-    @issues_by_author = Issue.by_author(@project)
-    @issues_by_subproject = Issue.by_subproject(@project) || []
-
-    render :template => "reports/issue_report"
-  end
-
-  def issue_report_details
     case params[:detail]
     when "tracker"
       @field = "tracker_id"
       @rows = @project.trackers
-      @data = Issue.by_tracker(@project)
+      @data = issues_by_tracker
       @report_title = l(:field_tracker)
+      render :template => "reports/issue_report_details"
     when "version"
       @field = "fixed_version_id"
-      @rows = @project.shared_versions.sort
+      @rows = @project.versions.sort
-      @data = Issue.by_version(@project)
+      @data = issues_by_version
       @report_title = l(:field_version)
+      render :template => "reports/issue_report_details"
     when "priority"
       @field = "priority_id"
-      @rows = IssuePriority.all.reverse
+      @rows = Enumeration::get_values('IPRI')
-      @data = Issue.by_priority(@project)
+      @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 = Issue.by_category(@project)
+      @data = issues_by_category
       @report_title = l(:field_category)
+      render :template => "reports/issue_report_details"   
     when "assigned_to"
       @field = "assigned_to_id"
-      @rows = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort
+      @rows = @project.members.collect { |m| m.user }
-      @data = Issue.by_assigned_to(@project)
+      @data = issues_by_assigned_to
       @report_title = l(:field_assigned_to)
+      render :template => "reports/issue_report_details"
     when "author"
       @field = "author_id"
-      @rows = @project.users.sort
+      @rows = @project.members.collect { |m| m.user }
-      @data = Issue.by_author(@project)
+      @data = issues_by_author
       @report_title = l(:field_author)
+      render :template => "reports/issue_report_details"  
     when "subproject"
       @field = "project_id"
-      @rows = @project.descendants.visible
+      @rows = @project.active_children
-      @data = Issue.by_subproject(@project) || []
+      @data = issues_by_subproject
       @report_title = l(:field_subproject)
-    end
+      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
       
-    respond_to do |format|
+      render :template => "reports/issue_report"
-      if @field
-        format.html {}
-      else
-        format.html { redirect_to :action => 'issue_report', :id => @project }
-      end
     end
   end  
   
-  private
+  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 ||=[]
     
-  def find_issue_statuses
+    @x_from = 0
-    @statuses = IssueStatus.find(:all, :order => 'position')
+    @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

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -18,133 +18,74 @@
 require 'SVG/Graph/Bar'
 require 'SVG/Graph/BarHorizontal'
 require 'digest/sha1'
-require 'redmine/scm/adapters/abstract_adapter'
 
 class ChangesetNotFound < Exception; end
 class InvalidRevisionParam < Exception; end
 
 class RepositoriesController < ApplicationController
+  layout 'base'
   menu_item :repository
-  menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers]
+  before_filter :find_repository, :except => :edit
-  default_search_scope :changesets
+  before_filter :find_project, :only => :edit
-
-  before_filter :find_project_by_project_id, :only => [:new, :create]
-  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
-  before_filter :find_project_repository, :except => [:new, :create, :edit, :update, :destroy, :committers]
-  before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize
-  accept_rss_auth :revisions
+  accept_key_auth :revisions
   
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   
-  def new
-    scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
-    @repository = Repository.factory(scm)
-    @repository.is_default = @project.repository.nil?
-    @repository.project = @project
-  end
-
-  def create
-    attrs = pickup_extra_info
-    @repository = Repository.factory(params[:repository_scm])
-    @repository.safe_attributes = params[:repository]
-    if attrs[:attrs_extra].keys.any?
-      @repository.merge_extra_info(attrs[:attrs_extra])
-    end
-    @repository.project = @project
-    if request.post? && @repository.save
-      redirect_to settings_project_path(@project, :tab => 'repositories')
-    else
-      render :action => 'new'
-    end
-  end
-
   def edit
-  end
+    @repository = @project.repository
-
+    if !@repository
-  def update
+      @repository = Repository.factory(params[:repository_scm])
-    attrs = pickup_extra_info
+      @repository.project = @project if @repository
-    @repository.safe_attributes = attrs[:attrs]
-    if attrs[:attrs_extra].keys.any?
-      @repository.merge_extra_info(attrs[:attrs_extra])
     end
-    @repository.project = @project
+    if request.post? && @repository
-    if request.put? && @repository.save
+      @repository.attributes = params[:repository]
-      redirect_to settings_project_path(@project, :tab => 'repositories')
+      @repository.save
-    else
-      render :action => 'edit'
-    end
-  end
-
-  def pickup_extra_info
-    p       = {}
-    p_extra = {}
-    params[:repository].each do |k, v|
-      if k =~ /^extra_/
-        p_extra[k] = v
-      else
-        p[k] = v
-      end
-    end
-    {:attrs => p, :attrs_extra => p_extra}
-  end
-  private :pickup_extra_info
-
-  def committers
-    @committers = @repository.committers
-    @users = @project.users
-    additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
-    @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
-    @users.compact!
-    @users.sort!
-    if request.post? && params[:committers].is_a?(Hash)
-      # Build a hash with repository usernames as keys and corresponding user ids as values
-      @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to settings_project_path(@project, :tab => 'repositories')
     end
+    render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
   end
   
   def destroy
-    @repository.destroy if request.delete?
+    @repository.destroy
-    redirect_to settings_project_path(@project, :tab => 'repositories')
+    redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
   end
   
   def show
-    @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
+    # 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)
-    @changeset = @repository.find_changeset_by_name(@rev)
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      (show_error_not_found; return) unless @entries
+      show_error_not_found and return unless @entries
-      @changesets = @repository.latest_changesets(@path, @rev)
       @properties = @repository.properties(@path, @rev)
-      @repositories = @project.repositories
+      render :action => 'browse'
-      render :action => 'show'
     end
   end
   
-  alias_method :browse, :show
-
   def changes
     @entry = @repository.entry(@path, @rev)
-    (show_error_not_found; return) unless @entry
+    show_error_not_found and return unless @entry
-    @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
+    @changesets = @repository.changesets_for_path(@path)
     @properties = @repository.properties(@path, @rev)
-    @changeset = @repository.find_changeset_by_name(@rev)
   end
   
   def revisions
     @changeset_count = @repository.changesets.count
     @changeset_pages = Paginator.new self, @changeset_count,
-                                     per_page_option,
+								      per_page_option,
-                                     params['page']
+								      params['page']								
     @changesets = @repository.changesets.find(:all,
-                       :limit  =>  @changeset_pages.items_per_page,
+						:limit  =>  @changeset_pages.items_per_page,
-                       :offset =>  @changeset_pages.current.offset,
+						:offset =>  @changeset_pages.current.offset)
-                       :include => [:user, :repository, :parents])
 
     respond_to do |format|
       format.html { render :layout => false if request.xhr? }
@@ -152,105 +93,50 @@ class RepositoriesController < ApplicationController
     end
   end
   
-  def raw
-    entry_and_raw(true)
-  end
-
   def entry
-    entry_and_raw(false)
-  end
-
-  def entry_and_raw(is_raw)
     @entry = @repository.entry(@path, @rev)
-    (show_error_not_found; return) unless @entry
+    show_error_not_found and return unless @entry
     
     # If the entry is a dir, show the browser
-    (show; return) if @entry.is_dir?
+    browse and return if @entry.is_dir?
     
     @content = @repository.cat(@path, @rev)
-    (show_error_not_found; return) unless @content
+    show_error_not_found and return unless @content
-    if is_raw ||
+    if 'raw' == params[:format] || @content.is_binary_data?
-         (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
+      # Force the download if it's a binary file
-         ! is_entry_text_data?(@content, @path)
+      send_data @content, :filename => @path.split('/').last
-      # Force the download
-      send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
-      send_type = Redmine::MimeType.of(@path)
-      send_opt[:type] = send_type.to_s if send_type
-      send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) && !is_raw ? 'inline' : 'attachment')
-      send_data @content, send_opt
     else
       # Prevent empty lines when displaying a file with Windows style eol
-      # TODO: UTF-16
-      # Is this needs? AttachmentsController reads file simply.
       @content.gsub!("\r\n", "\n")
-      @changeset = @repository.find_changeset_by_name(@rev)
+   end
-    end
   end
-  private :entry_and_raw
-
-  def is_entry_text_data?(ent, path)
-    # UTF-16 contains "\x00".
-    # It is very strict that file contains less than 30% of ascii symbols
-    # in non Western Europe.
-    return true if Redmine::MimeType.is_type?('text', path)
-    # Ruby 1.8.6 has a bug of integer divisions.
-    # http://apidock.com/ruby/v1_8_6_287/String/is_binary_data%3F
-    return false if ent.is_binary_data?
-    true
-  end
-  private :is_entry_text_data?
   
   def annotate
-    @entry = @repository.entry(@path, @rev)
-    (show_error_not_found; return) unless @entry
-
     @annotate = @repository.scm.annotate(@path, @rev)
-    if @annotate.nil? || @annotate.empty?
+    render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
-      (render_error l(:error_scm_annotate); return)
-    end
-    ann_buf_size = 0
-    @annotate.lines.each do |buf|
-      ann_buf_size += buf.size
-    end
-    if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte
-      (render_error l(:error_scm_annotate_big_text_file); return)
-    end
-    @changeset = @repository.find_changeset_by_name(@rev)
   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
-  end
+  rescue ChangesetNotFound
-
+    show_error_not_found
-  # Adds a related issue to a changeset
-  # POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues
-  def add_related_issue
-    @issue = @changeset.find_referenced_issue_by_id(params[:issue_id])
-    if @issue && (!@issue.visible? || @changeset.issues.include?(@issue))
-      @issue = nil
-    end
-
-    if @issue
-      @changeset.issues << @issue
-    end
-  end
-
-  # Removes a related issue from a changeset
-  # DELETE /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues/:issue_id
-  def remove_related_issue
-    @issue = Issue.visible.find_by_id(params[:issue_id])
-    if @issue
-      @changeset.issues.delete(@issue)
-    end
   end
   
   def diff
     if params[:format] == 'diff'
       @diff = @repository.diff(@path, @rev, @rev_to)
-      (show_error_not_found; return) unless @diff
+      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",
@@ -265,16 +151,12 @@ class RepositoriesController < ApplicationController
         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}-#{current_language}")
+      @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
-
-      @changeset = @repository.find_changeset_by_name(@rev)
-      @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
-      @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
     end
   end
   
@@ -297,49 +179,32 @@ class RepositoriesController < ApplicationController
     end
   end
   
-  private
+private
-
+  def find_project
-  def find_repository
+    @project = Project.find(params[:id])
-    @repository = Repository.find(params[:id])
-    @project = @repository.project
   rescue ActiveRecord::RecordNotFound
     render_404
   end
   
-  REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i
+  REV_PARAM_RE = %r{^[a-f0-9]*$}
   
-  def find_project_repository
+  def find_repository
     @project = Project.find(params[:id])
-    if params[:repository_id].present?
+    @repository = @project.repository
-      @repository = @project.repositories.find_by_identifier_param(params[:repository_id])
+    render_404 and return false unless @repository
-    else
+    @path = params[:path].join('/') unless params[:path].nil?
-      @repository = @project.repository
+    @path ||= ''
-    end
+    @rev = params[:rev]
-    (render_404; return false) unless @repository
-    @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s
-    @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip
     @rev_to = params[:rev_to]
-
+    raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
-    unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE)
-      if @repository.branches.blank?
-        raise InvalidRevisionParam
-      end
-    end
   rescue ActiveRecord::RecordNotFound
     render_404
   rescue InvalidRevisionParam
     show_error_not_found
   end
 
-  def find_changeset
-    if @rev.present?
-      @changeset = @repository.find_changeset_by_name(@rev)
-    end
-    show_error_not_found unless @changeset
-  end
-
   def show_error_not_found
-    render_error :message => l(:error_scm_not_found), :status => 404
+    render_error l(:error_scm_not_found)
   end
   
   # Handler for Redmine::Scm::Adapters::CommandFailed exception
@@ -351,20 +216,17 @@ class RepositoriesController < ApplicationController
     @date_to = Date.today
     @date_from = @date_to << 11
     @date_from = Date.civil(@date_from.year, @date_from.month, 1)
-    commits_by_day = Changeset.count(
+    commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
-                          :all, :group => :commit_date,
-                          :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
     commits_by_month = [0] * 12
-    commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
+    commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
 
-    changes_by_day = Change.count(
+    changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
-                          :all, :group => :commit_date, :include => :changeset,
-                          :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
     changes_by_month = [0] * 12
-    changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
+    changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
    
     fields = []
-    12.times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}
+    month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
+    12.times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
   
     graph = SVG::Graph::Bar.new(
       :height => 300,
@@ -392,10 +254,10 @@ class RepositoriesController < ApplicationController
   end
 
   def graph_commits_per_author(repository)
-    commits_by_author = Changeset.count(:all, :group => :committer, :conditions => ["repository_id = ?", repository.id])
+    commits_by_author = repository.changesets.count(:all, :group => :committer)
-    commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
+    commits_by_author.sort! {|x, y| x.last <=> y.last}
 
-    changes_by_author = Change.count(:all, :group => :committer, :include => :changeset, :conditions => ["#{Changeset.table_name}.repository_id = ?", repository.id])
+    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}
@@ -420,14 +282,34 @@ class RepositoriesController < ApplicationController
       :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

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,77 +16,93 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class RolesController < ApplicationController
-  layout 'admin'
+  layout 'base'	
+  before_filter :require_admin
 
-  before_filter :require_admin, :except => [:index, :show]
+  verify :method => :post, :only => [ :destroy, :move ],
-  before_filter :require_admin_or_api_request, :only => [:index, :show]
+         :redirect_to => { :action => :list }
-  before_filter :find_role, :only => [:show, :edit, :update, :destroy]
-  accept_api_auth :index, :show
 
   def index
-    respond_to do |format|
+    list
-      format.html {
+    render :action => 'list' unless request.xhr?
-        @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
-        render :action => "index", :layout => false if request.xhr?
-      }
-      format.api {
-        @roles = Role.givable.all
-      }
-    end
   end
 
-  def show
+  def list
-    respond_to do |format|
+    @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
-      format.api
+    render :action => "list", :layout => false if request.xhr?
-    end
   end
 
   def new
-    # Prefills the form with 'Non member' role permissions by default
+    # Prefills the form with 'Non member' role permissions
     @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
-    if params[:copy].present? && @copy_from = Role.find_by_id(params[:copy])
-      @role.copy_from(@copy_from)
-    end
-    @roles = Role.sorted.all
-  end
-
-  def create
-    @role = Role.new(params[:role])
     if request.post? && @role.save
       # workflow copy
       if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
-        @role.workflow_rules.copy(copy_from)
+        @role.workflows.copy(copy_from)
       end
       flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list'
-    else
-      @roles = Role.sorted.all
-      render :action => 'new'
     end
+    @permissions = @role.setable_permissions
+    @roles = Role.find :all, :order => 'builtin, position'
   end
 
   def edit
-  end
+    @role = Role.find(params[:id])
-
+    if request.post? and @role.update_attributes(params[:role])
-  def update
-    if request.put? and @role.update_attributes(params[:role])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list'
-    else
-      render :action => 'edit'
     end
+    @permissions = @role.setable_permissions
   end
 
   def destroy
+    @role = Role.find(params[:id])
     @role.destroy
-    redirect_to :action => 'index'
+    redirect_to :action => 'list'
   rescue
-    flash[:error] =  l(:error_can_not_remove_role)
+    flash[:error] = 'This role is in use and can not be deleted.'
     redirect_to :action => 'index'
   end
   
-  def permissions
+  def move
-    @roles = Role.sorted.all
+    @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|
@@ -94,15 +110,7 @@ class RolesController < ApplicationController
         role.save
       end
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list'
     end
   end
-
-  private
-
-  def find_role
-    @role = Role.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
 end

app/controllers/search_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,6 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class SearchController < ApplicationController
+  layout 'base'
+  
   before_filter :find_optional_project
 
   helper :messages
@@ -24,8 +26,8 @@ class SearchController < ApplicationController
   def index
     @question = params[:q] || ""
     @question.strip!
-    @all_words = params[:all_words] ? params[:all_words].present? : true
+    @all_words = params[:all_words] || (params[:submit] ? false : true)
-    @titles_only = params[:titles_only] ? params[:titles_only].present? : false
+    @titles_only = !params[:titles_only].nil?
     
     projects_to_search =
       case params[:scope]
@@ -34,7 +36,7 @@ class SearchController < ApplicationController
       when 'my_projects'
         User.current.memberships.collect(&:project)
       when 'subprojects'
-        @project ? (@project.self_and_descendants.active.all) : nil
+        @project ? ([ @project ] + @project.active_children) : nil
       else
         @project
       end
@@ -43,12 +45,12 @@ class SearchController < ApplicationController
     begin; offset = params[:offset].to_time if params[:offset]; rescue; end
     
     # quick jump to an issue
-    if @question.match(/^#?(\d+)$/) && Issue.visible.find_by_id($1.to_i)
+    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 = Redmine::Search.available_search_types.dup
+    @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')
@@ -62,19 +64,21 @@ class SearchController < ApplicationController
     # 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 2 characters long
+    # tokens must be at least 3 character long
-    @tokens = @tokens.uniq.select {|w| w.length > 1 }
+    @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(@tokens, projects_to_search,
+        r, c = s.singularize.camelcase.constantize.search(like_tokens, projects_to_search,
           :all_words => @all_words,
           :titles_only => @titles_only,
           :limit => (limit+1),

app/controllers/settings_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,9 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class SettingsController < ApplicationController
-  layout 'admin'
+  layout 'base'	
-  menu_item :plugins, :only => :plugin
-
   before_filter :require_admin
   
   def index
@@ -27,7 +25,7 @@ class SettingsController < ApplicationController
   end
 
   def edit
-    @notifiables = Redmine::Notifiable.all
+    @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|
@@ -37,30 +35,22 @@ class SettingsController < ApplicationController
       end
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'edit', :tab => params[:tab]
-    else
+      return
-      @options = {}
-      user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]}
-      @options[:user_format] = user_format.collect{|f| [User.current.name(f[0]), f[0].to_s]}
-      @deliveries = ActionMailer::Base.perform_deliveries
-
-      @guessed_host_and_path = request.host_with_port.dup
-      @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank?
-
-      Redmine::Themes.rescan
     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 = Redmine::Plugin.find(params[:id])
+    plugin_id = params[:id].to_sym
+    @plugin = Redmine::Plugin.registered_plugins[plugin_id]
     if request.post?
-      Setting.send "plugin_#{@plugin.id}=", params[:settings]
+      Setting["plugin_#{plugin_id}"] = params[:settings]
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'plugin', :id => @plugin.id
+      redirect_to :action => 'plugin', :id => params[:id]
-    else
-      @partial = @plugin.settings[:partial]
-      @settings = Setting.send "plugin_#{@plugin.id}"
     end
-  rescue Redmine::PluginNotFound
+    @partial = @plugin.settings[:partial]
-    render_404
+    @settings = Setting["plugin_#{plugin_id}"]
   end
 end

app/controllers/sys_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,69 +16,32 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class SysController < ActionController::Base
-  before_filter :check_enabled
+  wsdl_service_name 'Sys'
+  web_service_api SysApi
+  web_service_scaffold :invoke
   
+  before_invocation :check_enabled
+  
+  # Returns the projects list, with their repositories
   def projects
-    p = Project.active.has_module(:repository).find(
+    Project.find(:all, :include => :repository)
-                   :all,
-                   :include => :repository,
-                   :order => "#{Project.table_name}.identifier"
-                 )
-    # extra_info attribute from repository breaks activeresource client
-    render :xml => p.to_xml(
-                       :only => [:id, :identifier, :name, :is_public, :status],
-                       :include => {:repository => {:only => [:id, :url]}}
-                     )
   end
 
-  def create_project_repository
+  # Registers a repository for the given project identifier
-    project = Project.find(params[:id])
+  # (Subversion specific)
-    if project.repository
+  def repository_created(identifier, url)
-      render :nothing => true, :status => 409
+    project = Project.find_by_identifier(identifier)
-    else
+    # Do not create the repository if the project has already one
-      logger.info "Repository for #{project.name} was reported to be created by #{request.remote_ip}."
+    return 0 unless project && project.repository.nil?
-      repository = Repository.factory(params[:vendor], params[:repository])
+    logger.debug "Repository for #{project.name} was created"
-      repository.project = project
+    repository = Repository.factory('Subversion', :project => project, :url => url)
-      if repository.save
+    repository.save
-        render :xml => {repository.class.name.underscore.gsub('/', '-') => {:id => repository.id, :url => repository.url}}, :status => 201
+    repository.id || 0
-      else
-        render :nothing => true, :status => 422
-      end
-    end
   end
 
-  def fetch_changesets
+protected
-    projects = []
-    scope = Project.active.has_module(:repository)
-    if params[:id]
-      project = nil
-      if params[:id].to_s =~ /^\d*$/
-        project = scope.find(params[:id])
-      else
-        project = scope.find_by_identifier(params[:id])
-      end
-      raise ActiveRecord::RecordNotFound unless project
-      projects << project
-    else
-      projects = scope.all
-    end
-    projects.each do |project|
-      project.repositories.each do |repository|
-        repository.fetch_changesets
-      end
-    end
-    render :nothing => true, :status => 200
-  rescue ActiveRecord::RecordNotFound
-    render :nothing => true, :status => 404
-  end
 
-  protected
+  def check_enabled(name, args)
-
+    Setting.sys_api_enabled?
-  def check_enabled
-    User.current = nil
-    unless Setting.sys_api_enabled? && params[:key].to_s == Setting.sys_api_key
-      render :text => 'Access denied. Repository management WS is disabled or key is invalid.', :status => 403
-      return false
-    end
   end
 end

app/controllers/timelog_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,19 +16,11 @@
 # 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
 
-  before_filter :find_project_for_new_time_entry, :only => [:create]
+  verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
-  before_filter :find_time_entry, :only => [:show, :edit, :update]
-  before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
-  before_filter :authorize, :except => [:new, :index, :report]
-
-  before_filter :find_optional_project, :only => [:index, :report]
-  before_filter :find_optional_project_for_new_time_entry, :only => [:new]
-  before_filter :authorize_global, :only => [:new, :index, :report]
-
-  accept_rss_auth :index
-  accept_api_auth :index, :show, :create, :update, :destroy
   
   helper :sort
   include SortHelper
@@ -37,258 +29,195 @@ class TimelogController < ApplicationController
   helper :custom_fields
   include CustomFieldsHelper
   
-  def index
-    sort_init 'spent_on', 'desc'
-    sort_update 'spent_on' => ['spent_on', "#{TimeEntry.table_name}.created_on"],
-                'user' => 'user_id',
-                'activity' => 'activity_id',
-                'project' => "#{Project.table_name}.name",
-                'issue' => 'issue_id',
-                'hours' => 'hours'
-
-    retrieve_date_range
-
-    scope = TimeEntry.visible.spent_between(@from, @to)
-    if @issue
-      scope = scope.on_issue(@issue)
-    elsif @project
-      scope = scope.on_project(@project, Setting.display_subprojects_issues?)
-    end
-
-    respond_to do |format|
-      format.html {
-        # Paginate results
-        @entry_count = scope.count
-        @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
-        @entries = scope.all(
-          :include => [:project, :activity, :user, {:issue => :tracker}],
-          :order => sort_clause,
-          :limit  =>  @entry_pages.items_per_page,
-          :offset =>  @entry_pages.current.offset
-        )
-        @total_hours = scope.sum(:hours).to_f
-
-        render :layout => !request.xhr?
-      }
-      format.api  {
-        @entry_count = scope.count
-        @offset, @limit = api_offset_and_limit
-        @entries = scope.all(
-          :include => [:project, :activity, :user, {:issue => :tracker}],
-          :order => sort_clause,
-          :limit  => @limit,
-          :offset => @offset
-        )
-      }
-      format.atom {
-        entries = scope.all(
-          :include => [:project, :activity, :user, {:issue => :tracker}],
-          :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 = scope.all(
-          :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
-          :order => sort_clause
-        )
-        send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
-      }
-    end
-  end
-
   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
-    @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], @from, @to)
+    
+    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(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
+      format.csv  { send_data(report_to_csv(@criterias, @periods, @hours).read, :type => 'text/csv; header=present', :filename => 'timelog.csv') }
     end
   end
   
-  def show
+  def details
-    respond_to do |format|
+    sort_init 'spent_on', 'desc'
-      # TODO: Implement html response
+    sort_update
-      format.html { render :nothing => true, :status => 406 }
-      format.api
-    end
-  end
     
-  def new
+    cond = ARCondition.new
-    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
+    cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
-    @time_entry.safe_attributes = params[:time_entry]
+                           ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
-  end
     
-  def create
+    retrieve_date_range
-    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
+    cond << ['spent_on BETWEEN ? AND ?', @from, @to]
-    @time_entry.safe_attributes = params[:time_entry]
 
-    call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
+    TimeEntry.visible_by(User.current) do
-
-    if @time_entry.save
       respond_to do |format|
         format.html {
-          flash[:notice] = l(:notice_successful_create)
+          # Paginate results
-          if params[:continue]
+          @entry_count = TimeEntry.count(:include => :project, :conditions => cond.conditions)
-            if params[:project_id]
+          @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
-              redirect_to :action => 'new', :project_id => @time_entry.project, :issue_id => @time_entry.issue,
+          @entries = TimeEntry.find(:all, 
-                :time_entry => {:issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
+                                    :include => [:project, :activity, :user, {:issue => :tracker}],
-                :back_url => params[:back_url]
+                                    :conditions => cond.conditions,
-            else
+                                    :order => sort_clause,
-              redirect_to :action => 'new',
+                                    :limit  =>  @entry_pages.items_per_page,
-                :time_entry => {:project_id => @time_entry.project_id, :issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
+                                    :offset =>  @entry_pages.current.offset)
-                :back_url => params[:back_url]
+          @total_hours = TimeEntry.sum(:hours, :include => :project, :conditions => cond.conditions).to_f
-            end
+
-          else
+          render :layout => !request.xhr?
-            redirect_back_or_default :action => 'index', :project_id => @time_entry.project
+        }
-          end
+        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')
         }
-        format.api  { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
-      end
-    else
-      respond_to do |format|
-        format.html { render :action => 'new' }
-        format.api  { render_validation_errors(@time_entry) }
       end
     end
   end
   
   def edit
-    @time_entry.safe_attributes = params[:time_entry]
+    render_403 and return if @time_entry && !@time_entry.editable_by?(User.current)
-  end
+    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
-
+    @time_entry.attributes = params[:time_entry]
-  def update
+    if request.post? and @time_entry.save
-    @time_entry.safe_attributes = params[:time_entry]
+      flash[:notice] = l(:notice_successful_update)
-
+      redirect_to(params[:back_url].blank? ? {:action => 'details', :project_id => @time_entry.project} : params[:back_url])
-    call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
+      return
-
-    if @time_entry.save
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_successful_update)
-          redirect_back_or_default :action => 'index', :project_id => @time_entry.project
-        }
-        format.api  { render_api_ok }
-      end
-    else
-      respond_to do |format|
-        format.html { render :action => 'edit' }
-        format.api  { render_validation_errors(@time_entry) }
-      end
     end    
   end
   
-  def bulk_edit
-    @available_activities = TimeEntryActivity.shared.active
-    @custom_fields = TimeEntry.first.available_custom_fields
-  end
-
-  def bulk_update
-    attributes = parse_params_for_bulk_time_entry_attributes(params)
-
-    unsaved_time_entry_ids = []
-    @time_entries.each do |time_entry|
-      time_entry.reload
-      time_entry.safe_attributes = attributes
-      call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry })
-      unless time_entry.save
-        # Keep unsaved time_entry ids to display them in flash error
-        unsaved_time_entry_ids << time_entry.id
-      end
-    end
-    set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
-    redirect_back_or_default({:controller => 'timelog', :action => 'index', :project_id => @projects.first})
-  end
-
   def destroy
-    destroyed = TimeEntry.transaction do
+    render_404 and return unless @time_entry
-      @time_entries.each do |t|
+    render_403 and return unless @time_entry.editable_by?(User.current)
-        unless t.destroy && t.destroyed?
+    @time_entry.destroy
-          raise ActiveRecord::Rollback
+    flash[:notice] = l(:notice_successful_delete)
-        end
+    redirect_to :back
-      end
+  rescue RedirectBackError
-    end
+    redirect_to :action => 'details', :project_id => @time_entry.project
-
-    respond_to do |format|
-      format.html {
-        if destroyed
-          flash[:notice] = l(:notice_successful_delete)
-        else
-          flash[:error] = l(:notice_unable_delete_time_entry)
-        end
-        redirect_back_or_default(:action => 'index', :project_id => @projects.first)
-      }
-      format.api  {
-        if destroyed
-          render_api_ok
-        else
-          render_validation_errors(@time_entries)
-        end
-      }
-    end
   end
 
 private
-  def find_time_entry
+  def find_project
-    @time_entry = TimeEntry.find(params[:id])
+    if params[:id]
-    unless @time_entry.editable_by?(User.current)
+      @time_entry = TimeEntry.find(params[:id])
-      render_403
+      @project = @time_entry.project
-      return false
+    elsif params[:issue_id]
-    end
-    @project = @time_entry.project
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  def find_time_entries
-    @time_entries = TimeEntry.find_all_by_id(params[:id] || params[:ids])
-    raise ActiveRecord::RecordNotFound if @time_entries.empty?
-    @projects = @time_entries.collect(&:project).compact.uniq
-    @project = @projects.first if @projects.size == 1
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
-    if unsaved_time_entry_ids.empty?
-      flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
-    else
-      flash[:error] = l(:notice_failed_to_save_time_entries,
-                        :count => unsaved_time_entry_ids.size,
-                        :total => time_entries.size,
-                        :ids => '#' + unsaved_time_entry_ids.join(', #'))
-    end
-  end
-
-  def find_optional_project_for_new_time_entry
-    if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
-      @project = Project.find(project_id)
-    end
-    if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
-      @issue = Issue.find(issue_id)
-      @project ||= @issue.project
-    end
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  def find_project_for_new_time_entry
-    find_optional_project_for_new_time_entry
-    if @project.nil?
-      render_404
-    end
-  end
-
-  def find_optional_project
-    if !params[:issue_id].blank?
       @issue = Issue.find(params[:issue_id])
       @project = @issue.project
-    elsif !params[:project_id].blank?
+    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
@@ -308,9 +237,6 @@ private
       when 'last_week'
         @from = Date.today - 7 - (Date.today.cwday - 1)%7
         @to = @from + 6
-      when 'last_2_weeks'
-        @from = Date.today - 14 - (Date.today.cwday - 1)%7
-        @to = @from + 13
       when '7_days'
         @from = Date.today - 7
         @to = Date.today
@@ -336,12 +262,7 @@ private
     end
     
     @from, @to = @to, @from if @from && @to && @from > @to
-  end
+    @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)
-  def parse_params_for_bulk_time_entry_attributes(params)
-    attributes = (params[:time_entry] || {}).reject {|k,v| v.blank?}
-    attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
-    attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
-    attributes
   end
 end

app/controllers/trackers_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,86 +16,65 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class TrackersController < ApplicationController
-  layout 'admin'
+  layout 'base'
-
+  before_filter :require_admin
-  before_filter :require_admin, :except => :index
-  before_filter :require_admin_or_api_request, :only => :index
-  accept_api_auth :index
 
   def index
-    respond_to do |format|
+    list
-      format.html {
+    render :action => 'list' unless request.xhr?
-        @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
+  end
-        render :action => "index", :layout => false if request.xhr?
+
-      }
+  # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
-      format.api {
+  verify :method => :post, :only => [ :destroy, :move ], :redirect_to => { :action => :list }
-        @trackers = Tracker.sorted.all
+
-      }
+  def list
-    end
+    @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])
-    @trackers = Tracker.find :all, :order => 'position'
-    @projects = Project.find(:all)
-  end
-
-  def create
     @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.workflow_rules.copy(copy_from)
+        @tracker.workflows.copy(copy_from)
       end
       flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'index'
+      redirect_to :action => 'list'
-      return
     end
-    new
+    @trackers = Tracker.find :all, :order => 'position'
-    render :action => 'new'
   end
 
   def edit
-    @tracker ||= Tracker.find(params[:id])
+    @tracker = Tracker.find(params[:id])
-    @projects = Project.find(:all)
+    if request.post? and @tracker.update_attributes(params[:tracker])
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'list'
+    end
   end
 
-  def update
+  def move
     @tracker = Tracker.find(params[:id])
-    if request.put? and @tracker.update_attributes(params[:tracker])
+    case params[:position]
-      flash[:notice] = l(:notice_successful_update)
+    when 'highest'
-      redirect_to :action => 'index'
+      @tracker.move_to_top
-      return
+    when 'higher'
-    end
+      @tracker.move_higher
-    edit
+    when 'lower'
-    render :action => 'edit'
+      @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] = l(:error_can_not_delete_tracker)
+      flash[:error] = "This tracker contains issues and can\'t be deleted."
     else
       @tracker.destroy
     end
-    redirect_to :action => 'index'
+    redirect_to :action => 'list'
-  end
-
-  def fields
-    if request.post? && params[:trackers]
-      params[:trackers].each do |tracker_id, tracker_params|
-        tracker = Tracker.find_by_id(tracker_id)
-        if tracker
-          tracker.core_fields = tracker_params[:core_fields]
-          tracker.custom_field_ids = tracker_params[:custom_field_ids]
-          tracker.save
-        end
-      end
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'fields'
-      return
-    end
-    @trackers = Tracker.sorted.all
-    @custom_fields = IssueCustomField.all.sort
   end  
 end

app/controllers/users_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,11 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class UsersController < ApplicationController
-  layout 'admin'
+  layout 'base'	
-
+  before_filter :require_admin
-  before_filter :require_admin, :except => :show
-  before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership]
-  accept_api_auth :index, :show, :create, :update, :destroy
 
   helper :sort
   include SortHelper
@@ -28,187 +25,77 @@ class UsersController < ApplicationController
   include CustomFieldsHelper   
 
   def index
+    list
+    render :action => 'list' unless request.xhr?
+  end
+
+  def list
     sort_init 'login', 'asc'
-    sort_update %w(login firstname lastname mail admin created_on last_login_on)
+    sort_update
     
-    case params[:format]
+    @status = params[:status] ? params[:status].to_i : 1
-    when 'xml', 'json'
+    conditions = "status <> 0"
-      @offset, @limit = api_offset_and_limit
+    conditions = ["status=?", @status] unless @status == 0
-    else
-      @limit = per_page_option
-    end
     
-    @status = params[:status] || 1
+    @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
 
-    scope = User.logged.status(@status)
+    render :action => "list", :layout => false if request.xhr?	
-    scope = scope.like(params[:name]) if params[:name].present?
-    scope = scope.in_group(params[:group_id]) if params[:group_id].present?
-
-    @user_count = scope.count
-    @user_pages = Paginator.new self, @user_count, @limit, params['page']
-    @offset ||= @user_pages.current.offset
-    @users =  scope.find :all,
-                        :order => sort_clause,
-                        :limit  =>  @limit,
-                        :offset =>  @offset
-
-    respond_to do |format|
-      format.html {
-        @groups = Group.all.sort
-        render :layout => !request.xhr?
-      }
-      format.api
-    end	
   end
 
-  def show
+  def add
-    # show projects based on current user visibility
+    if request.get?
-    @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current))
+      @user = User.new(:language => Setting.default_language)
-
+    else
-    events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
+      @user = User.new(params[:user])
-    @events_by_day = events.group_by(&:event_date)
+      @user.admin = params[:user][:admin] || false
-
+      @user.login = params[:user][:login]
-    unless User.current.admin?
+      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
-      if !@user.active? || (@user != User.current  && @memberships.empty? && events.empty?)
+      if @user.save
-        render_404
+        Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
-        return
+        flash[:notice] = l(:notice_successful_create)
+        redirect_to :action => 'list'
       end
     end
-
-    respond_to do |format|
-      format.html { render :layout => 'base' }
-      format.api
-    end
-  end
-
-  def new
-    @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
     @auth_sources = AuthSource.find(:all)
   end
 
-  def create
-    @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
-    @user.safe_attributes = params[:user]
-    @user.admin = params[:user][:admin] || false
-    @user.login = params[:user][:login]
-    @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id
-
-    if @user.save
-      @user.pref.attributes = params[:pref]
-      @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
-      @user.pref.save
-      @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
-
-      Mailer.account_information(@user, params[:user][:password]).deliver if params[:send_information]
-
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_user_successful_create, :id => view_context.link_to(@user.login, user_path(@user)))
-          redirect_to(params[:continue] ?
-            {:controller => 'users', :action => 'new'} :
-            {:controller => 'users', :action => 'edit', :id => @user}
-          )
-        }
-        format.api  { render :action => 'show', :status => :created, :location => user_url(@user) }
-      end
-    else
-      @auth_sources = AuthSource.find(:all)
-      # Clear password input
-      @user.password = @user.password_confirmation = nil
-
-      respond_to do |format|
-        format.html { render :action => 'new' }
-        format.api  { render_validation_errors(@user) }
-      end
-    end
-  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
-  end
+    @memberships = @user.memberships
-
-  def update
-    @user.admin = params[:user][:admin] if params[:user][:admin]
-    @user.login = params[:user][:login] if params[:user][:login]
-    if params[:user][:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)
-      @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation]
-    end
-    @user.safe_attributes = params[:user]
-    # Was the account actived ? (do it before User#save clears the change)
-    was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
-    # TODO: Similar to My#account
-    @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 = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
-
-      if was_activated
-        Mailer.account_activated(@user).deliver
-      elsif @user.active? && params[:send_information] && !params[:user][:password].blank? && @user.auth_source_id.nil?
-        Mailer.account_information(@user, params[:user][:password]).deliver
-      end
-
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_successful_update)
-          redirect_to_referer_or edit_user_path(@user)
-        }
-        format.api  { render_api_ok }
-      end
-    else
-      @auth_sources = AuthSource.find(:all)
-      @membership ||= Member.new
-      # Clear password input
-      @user.password = @user.password_confirmation = nil
-
-      respond_to do |format|
-        format.html { render :action => :edit }
-        format.api  { render_validation_errors(@user) }
-      end
-    end
-  end
-
-  def destroy
-    @user.destroy
-    respond_to do |format|
-      format.html { redirect_back_or_default(users_url) }
-      format.api  { render_api_ok }
-    end
   end
   
   def edit_membership
-    @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
+    @user = User.find(params[:id])
-    @membership.save
+    @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
-    respond_to do |format|
+    @membership.attributes = params[:membership]
-      format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
+    @membership.save if request.post?
-      format.js
+    redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
-    end
   end
   
   def destroy_membership
-    @membership = Member.find(params[:membership_id])
+    @user = User.find(params[:id])
-    if @membership.deletable?
+    Member.find(params[:membership_id]).destroy if request.post?
-      @membership.destroy
+    redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
-    end
-    respond_to do |format|
-      format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
-      format.js
-    end
-  end
-
-  private
-
-  def find_user
-    if params[:id] == 'current'
-      require_login || return
-      @user = User.current
-    else
-      @user = User.find(params[:id])
-    end
-  rescue ActiveRecord::RecordNotFound
-    render_404
   end
 end

app/controllers/versions_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,166 +16,46 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class VersionsController < ApplicationController
+  layout 'base'
   menu_item :roadmap
-  model_object Version
+  before_filter :find_project, :authorize
-  before_filter :find_model_object, :except => [:index, :new, :create, :close_completed]
-  before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed]
-  before_filter :find_project_by_project_id, :only => [:index, :new, :create, :close_completed]
-  before_filter :authorize
-
-  accept_api_auth :index, :show, :create, :update, :destroy
-
-  helper :custom_fields
-  helper :projects
-
-  def index
-    respond_to do |format|
-      format.html {
-        @trackers = @project.trackers.find(:all, :order => 'position')
-        retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
-        @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-        project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
-
-        @versions = @project.shared_versions || []
-        @versions += @project.rolled_up_versions.visible if @with_subprojects
-        @versions = @versions.uniq.sort
-        unless params[:completed]
-          @completed_versions = @versions.select {|version| version.closed? || version.completed? }
-          @versions -= @completed_versions
-        end
-
-        @issues_by_version = {}
-        if @selected_tracker_ids.any? && @versions.any?
-          issues = Issue.visible.all(
-            :include => [:project, :status, :tracker, :priority, :fixed_version],
-            :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids, :fixed_version_id => @versions.map(&:id)},
-            :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id"
-          )
-          @issues_by_version = issues.group_by(&:fixed_version)
-        end
-        @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
-      }
-      format.api {
-        @versions = @project.shared_versions.all
-      }
-    end
-  end
 
   def show
-    respond_to do |format|
-      format.html {
-        @issues = @version.fixed_issues.visible.find(:all,
-          :include => [:status, :tracker, :priority],
-          :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
-      }
-      format.api
-    end
-  end
-
-  def new
-    @version = @project.versions.build
-    @version.safe_attributes = params[:version]
-
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-
-  def create
-    @version = @project.versions.build
-    if params[:version]
-      attributes = params[:version].dup
-      attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
-      @version.safe_attributes = attributes
-    end
-
-    if request.post?
-      if @version.save
-        respond_to do |format|
-          format.html do
-            flash[:notice] = l(:notice_successful_create)
-            redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-          end
-          format.js
-          format.api do
-            render :action => 'show', :status => :created, :location => version_url(@version)
-          end
-        end
-      else
-        respond_to do |format|
-          format.html { render :action => 'new' }
-          format.js   { render :action => 'new' }
-          format.api  { render_validation_errors(@version) }
-        end
-      end
-    end
   end
   
   def edit
-  end
+    if request.post? and @version.update_attributes(params[:version])
-
+      flash[:notice] = l(:notice_successful_update)
-  def update
+      redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-    if request.put? && params[:version]
-      attributes = params[:version].dup
-      attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
-      @version.safe_attributes = attributes
-      if @version.save
-        respond_to do |format|
-          format.html {
-            flash[:notice] = l(:notice_successful_update)
-            redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-          }
-          format.api  { render_api_ok }
-        end
-      else
-        respond_to do |format|
-          format.html { render :action => 'edit' }
-          format.api  { render_validation_errors(@version) }
-        end
-      end
     end
   end
 
-  def close_completed
-    if request.put?
-      @project.close_completed_versions
-    end
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-  end
-
   def destroy
-    if @version.fixed_issues.empty?
+    @version.destroy
-      @version.destroy
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-      respond_to do |format|
+  rescue
-        format.html { redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project }
+    flash[:error] = "Unable to delete version"
-        format.api  { render_api_ok }
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-      end
+  end
-    else
+  
-      respond_to do |format|
+  def destroy_file
-        format.html {
+    @version.attachments.find(params[:attachment_id]).destroy
-          flash[:error] = l(:notice_unable_delete_version)
+    flash[:notice] = l(:notice_successful_delete)
-          redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+    redirect_to :controller => 'projects', :action => 'list_files', :id => @project
-        }
-        format.api  { head :unprocessable_entity }
-      end
-    end
   end
   
   def status_by
     respond_to do |format|
       format.html { render :action => 'show' }
-      format.js
+      format.js { render(:update) {|page| page.replace_html 'status_by', render_issue_status_by(@version, params[:status_by])} }
     end
   end
 
-  private
+private
-
+  def find_project
-  def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
+    @version = Version.find(params[:id])
-    if ids = params[:tracker_ids]
+    @project = @version.project
-      @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
+  rescue ActiveRecord::RecordNotFound
-    else
+    render_404
-      @selected_tracker_ids = (default_trackers || selectable_trackers).collect {|t| t.id.to_s }
-    end
   end  
 end

app/controllers/watchers_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,80 +16,38 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WatchersController < ApplicationController
-  before_filter :find_project
+  layout 'base'
-  before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
+  before_filter :require_login, :find_project, :check_project_privacy
-  before_filter :authorize, :only => [:new, :destroy]
   
-  def watch
+  def add
-    if @watched.respond_to?(:visible?) && !@watched.visible?(User.current)
+    user = User.current
-      render_403
+    @watched.add_watcher(user)
-    else
-      set_watcher(User.current, true)
-    end
-  end
-
-  def unwatch
-    set_watcher(User.current, false)
-  end
-
-  def new
-  end
-
-  def create
-    if params[:watcher].is_a?(Hash) && request.post?
-      user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
-      user_ids.each do |user_id|
-        Watcher.create(:watchable => @watched, :user_id => user_id)
-      end
-    end
-    respond_to do |format|
-      format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
-      format.js
-    end
-  end
-
-  def append
-    if params[:watcher].is_a?(Hash)
-      user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
-      @users = User.active.find_all_by_id(user_ids)
-    end
-  end
-
-  def destroy
-    @watched.set_watcher(User.find(params[:user_id]), false) if request.post?
     respond_to do |format|
       format.html { redirect_to :back }
-      format.js
+      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
     end
+  rescue RedirectBackError
+    render :text => 'Watcher added.', :layout => true
   end
   
-  def autocomplete_for_user
+  def remove
-    @users = User.active.like(params[:q]).find(:all, :limit => 100)
+    user = User.current
-    if @watched
+    @watched.remove_watcher(user)
-      @users -= @watched.watcher_users
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
     end
-    render :layout => false
+  rescue RedirectBackError
+    render :text => 'Watcher removed.', :layout => true
   end
 
 private
   def find_project
-    if params[:object_type] && params[:object_id]
+    klass = Object.const_get(params[:object_type].camelcase)
-      klass = Object.const_get(params[:object_type].camelcase)
+    return false unless klass.respond_to?('watched_by')
-      return false unless klass.respond_to?('watched_by')
+    @watched = klass.find(params[:object_id])
-      @watched = klass.find(params[:object_id])
+    @project = @watched.project
-      @project = @watched.project
-    elsif params[:project_id]
-      @project = Project.visible.find_by_param(params[:project_id])
-    end
   rescue
     render_404
   end
-
-  def set_watcher(user, watching)
-    @watched.set_watcher(user, watching)
-    respond_to do |format|
-      format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      format.js { render :partial => 'set_watcher', :locals => {:user => user, :watched => @watched} }
-    end
-  end
 end

app/controllers/welcome_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,15 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
-  caches_action :robots
+  layout 'base'
 
   def index
     @news = News.latest User.current
     @projects = Project.latest User.current
   end
-
-  def robots
-    @projects = Project.all_public.active
-    render :layout => false, :content_type => 'text/plain'
-  end
 end

app/controllers/wiki_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -17,54 +17,21 @@
 
 require 'diff'
 
-# The WikiController follows the Rails REST controller pattern but with
-# a few differences
-#
-# * index - shows a list of WikiPages grouped by page or date
-# * new - not used
-# * create - not used
-# * show - will also show the form for creating a new wiki page
-# * edit - used to edit an existing or new page
-# * update - used to save a wiki page update to the database, including new pages
-# * destroy - normal
-#
-# Other member and collection methods are also used
-#
-# TODO: still being worked on
 class WikiController < ApplicationController
-  default_search_scope :wiki_pages
+  layout 'base'
   before_filter :find_wiki, :authorize
-  before_filter :find_existing_or_new_page, :only => [:show, :edit, :update]
+  
-  before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy, :destroy_version]
+  verify :method => :post, :only => [:destroy, :destroy_attachment, :protect], :redirect_to => { :action => :index }
-  accept_api_auth :index, :show, :update, :destroy
 
   helper :attachments
   include AttachmentsHelper   
-  helper :watchers
-  include Redmine::Export::PDF
-
-  # List of pages, sorted alphabetically and by parent (hierarchy)
-  def index
-    load_pages_for_index
-
-    respond_to do |format|
-      format.html {
-        @pages_by_parent_id = @pages.group_by(&:parent_id)
-      }
-      format.api
-    end
-  end
-
-  # List of page, by last update
-  def date_index
-    load_pages_for_index
-    @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
-  end
   
   # display a page (in editing mode if it doesn't exist)
-  def show
+  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) && editable? && !api_request?
+      if User.current.allowed_to?(:edit_wiki_pages, @project)
         edit
         render :action => 'edit'
       else
@@ -72,146 +39,74 @@ class WikiController < ApplicationController
       end
       return
     end
-    if params[:version] && !User.current.allowed_to?(:view_wiki_edits, @project)
+    @content = @page.content_for_version(params[:version])
-      deny_access
+    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
-    @content = @page.content_for_version(params[:version])
+	@editable = editable?
-    if User.current.allowed_to?(:export_wiki_pages, @project)
+    render :action => 'show'
-      if params[:format] == 'pdf'
-        send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => "#{@page.title}.pdf")
-        return
-      elsif params[:format] == 'html'
-        export = render_to_string :action => 'export', :layout => false
-        send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
-        return
-      elsif params[:format] == 'txt'
-        send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
-        return
-      end
-    end
-    @editable = editable?
-    @sections_editable = @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) &&
-      @content.current_version? &&
-      Redmine::WikiFormatting.supports_section_edit?
-
-    respond_to do |format|
-      format.html
-      format.api
-    end
   end
   
   # edit an existing page or a new one
   def edit
+    @page = @wiki.find_or_new_page(params[:page])    
     return render_403 unless editable?
-    if @page.new_record?
+    @page.content = WikiContent.new(:page => @page) if @page.new_record?
-      @page.content = WikiContent.new(:page => @page)
-      if params[:parent].present?
-        @page.parent = @page.wiki.find_page(params[:parent].to_s)
-      end
-    end
     
     @content = @page.content_for_version(params[:version])
-    @content.text = initial_page_content(@page) if @content.text.blank?
+    @content.text = "h1. #{@page.pretty_title}" if @content.text.blank?
     # don't keep previous comment
     @content.comments = nil
-
+    if request.post?      
-    # To prevent StaleObjectError exception when reverting to a previous version
+      if !@page.new_record? && @content.text == params[:content][:text]
-    @content.version = @page.content.version
+        # don't save if text wasn't changed
-
+        redirect_to :action => 'index', :id => @project, :page => @page.title
-    @text = @content.text
+        return
-    if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
-      @section = params[:section].to_i
-      @text, @section_hash = Redmine::WikiFormatting.formatter.new(@text).get_section(@section)
-      render_404 if @text.blank?
-    end
-  end
-
-  # Creates a new page or updates an existing one
-  def update
-    return render_403 unless editable?
-    was_new_page = @page.new_record?
-    @page.content = WikiContent.new(:page => @page) if @page.new_record?
-    @page.safe_attributes = params[:wiki_page]
-
-    @content = @page.content
-    content_params = params[:content]
-    if content_params.nil? && params[:wiki_page].is_a?(Hash)
-      content_params = params[:wiki_page].slice(:text, :comments, :version)
-    end
-    content_params ||= {}
-
-    @content.comments = content_params[:comments]
-    @text = content_params[:text]
-    if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
-      @section = params[:section].to_i
-      @section_hash = params[:section_hash]
-      @content.text = Redmine::WikiFormatting.formatter.new(@content.text).update_section(params[:section].to_i, @text, @section_hash)
-    else
-      @content.version = content_params[:version] if content_params[:version]
-      @content.text = @text
-    end
-    @content.author = User.current
-
-    if @page.save_with_content
-      attachments = Attachment.attach_files(@page, params[:attachments])
-      render_attachment_warning_if_needed(@page)
-      call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
-
-      respond_to do |format|
-        format.html { redirect_to :action => 'show', :project_id => @project, :id => @page.title }
-        format.api {
-          if was_new_page
-            render :action => 'show', :status => :created, :location => url_for(:controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title)
-          else
-            render_api_ok
-          end
-        }
       end
-    else
+      #@content.text = params[:content][:text]
-      respond_to do |format|
+      #@content.comments = params[:content][:comments]
-        format.html { render :action => 'edit' }
+      @content.attributes = params[:content]
-        format.api { render_validation_errors(@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
-  rescue ActiveRecord::StaleObjectError, Redmine::WikiFormatting::StaleSectionError
     # Optimistic locking exception
-    respond_to do |format|
+    flash[:error] = l(:notice_locking_conflict)
-      format.html {
-        flash.now[:error] = l(:notice_locking_conflict)
-        render :action => 'edit'
-      }
-      format.api { render_api_head :conflict }
-    end
-  rescue ActiveRecord::RecordNotSaved
-    respond_to do |format|
-      format.html { render :action => 'edit' }
-      format.api { render_validation_errors(@content) }
-    end
   end
   
   # rename a page
   def rename
-    return render_403 unless editable?
+    @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 => 'show', :project_id => @project, :id => @page.title
+      redirect_to :action => 'index', :id => @project, :page => @page.title
     end
   end
   
   def protect
-    @page.update_attribute :protected, params[:protected]
+    page = @wiki.find_page(params[:page])
-    redirect_to :action => 'show', :project_id => @project, :id => @page.title
+    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['page']
+    @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",
@@ -223,72 +118,51 @@ class WikiController < ApplicationController
   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])
-    render_404 unless @annotate
   end
   
-  # Removes a wiki page and its history
+  # remove a wiki page and its history
-  # Children can be either set as root pages, removed or reassigned to another parent page
   def destroy
-    return render_403 unless editable?
+    @page = @wiki.find_page(params[:page])
-
+	return render_403 unless editable?
-    @descendants_count = @page.descendants.size
+    @page.destroy if @page
-    if @descendants_count > 0
+    redirect_to :action => 'special', :id => @project, :page => 'Page_index'
-      case params[:todo]
-      when 'nullify'
-        # Nothing to do
-      when 'destroy'
-        # Removes all its descendants
-        @page.descendants.each(&:destroy)
-      when 'reassign'
-        # Reassign children to another parent page
-        reassign_to = @wiki.pages.find_by_id(params[:reassign_to_id].to_i)
-        return unless reassign_to
-        @page.children.each do |child|
-          child.update_attribute(:parent, reassign_to)
-        end
-      else
-        @reassignable_to = @wiki.pages - @page.self_and_descendants
-        # display the destroy form if it's a user request
-        return unless api_request?
-      end
-    end
-    @page.destroy
-    respond_to do |format|
-      format.html { redirect_to :action => 'index', :project_id => @project }
-      format.api { render_api_ok }
-    end
   end
 
-  def destroy_version
+  # display special pages
-    return render_403 unless editable?
+  def special
-
+    page_title = params[:page].downcase
-    @content = @page.content_for_version(params[:version])
+    case page_title
-    @content.destroy
+    # show pages index, sorted by title
-    redirect_to_referer_or :action => 'history', :id => @page.title, :project_id => @project
+    when 'page_index', 'date_index'
-  end
+      # eager load information about last updates, without loading text
-
+      @pages = @wiki.pages.find :all, :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
-  # Export wiki to a single pdf or html file
+                                      :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
-  def export
+                                      :order => 'title'
-    @pages = @wiki.pages.all(:order => 'title', :include => [:content, {:attachments => :author}])
+      @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
-    respond_to do |format|
+      @pages_by_parent_id = @pages.group_by(&:parent_id)
-      format.html {
+    # export wiki to a single html file
-        export = render_to_string :action => 'export_multiple', :layout => false
+    when 'export'
-        send_data(export, :type => 'text/html', :filename => "wiki.html")
+      @pages = @wiki.pages.find :all, :order => 'title'
-      }
+      export = render_to_string :action => 'export_multiple', :layout => false
-      format.pdf {
+      send_data(export, :type => 'text/html', :filename => "wiki.html")
-        send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => "#{@project.identifier}.pdf")
+      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[:id])
+    page = @wiki.find_page(params[:page])
     # page is nil when previewing a new page
     return render_403 unless page.nil? || editable?(page)
     if page
@@ -300,55 +174,31 @@ class WikiController < ApplicationController
   end
 
   def add_attachment
+    @page = @wiki.find_page(params[:page])
     return render_403 unless editable?
-    attachments = Attachment.attach_files(@page, params[:attachments])
+    attach_files(@page, params[:attachments])
-    render_attachment_warning_if_needed(@page)
+    redirect_to :action => 'index', :page => @page.title
-    redirect_to :action => 'show', :id => @page.title, :project_id => @project
+  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[:project_id])
+    @project = Project.find(params[:id])
     @wiki = @project.wiki
     render_404 unless @wiki
   rescue ActiveRecord::RecordNotFound
     render_404
   end
   
-  # Finds the requested page or a new page if it doesn't exist
-  def find_existing_or_new_page
-    @page = @wiki.find_or_new_page(params[:id])
-    if @wiki.page_found_with_redirect?
-      redirect_to params.update(:id => @page.title)
-    end
-  end
-
-  # Finds the requested page and returns a 404 error if it doesn't exist
-  def find_existing_page
-    @page = @wiki.find_page(params[:id])
-    if @page.nil?
-      render_404
-      return
-    end
-    if @wiki.page_found_with_redirect?
-      redirect_to params.update(:id => @page.title)
-    end
-  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
-
-  # Returns the default content of a new wiki page
-  def initial_page_content(page)
-    helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
-    extend helper unless self.instance_of?(helper)
-    helper.instance_method(:initial_page_content).bind(self).call(page)
-  end
-
-  def load_pages_for_index
-    @pages = @wiki.pages.with_updated_on.order("#{WikiPage.table_name}.title").includes(:wiki => :project).includes(:parent).all
-  end
 end

app/controllers/wikis_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,14 +16,16 @@
 # 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.safe_attributes = params[:wiki]
+    @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
@@ -33,4 +35,11 @@ class WikisController < ApplicationController
       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

app/controllers/workflows_controller.rb

@@ -1,128 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2012  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 WorkflowsController < ApplicationController
-  layout 'admin'
-
-  before_filter :require_admin, :find_roles, :find_trackers
-
-  def index
-    @workflow_counts = WorkflowTransition.count_by_tracker_and_role
-  end
-
-  def edit
-    @role = Role.find_by_id(params[:role_id]) if params[:role_id]
-    @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
-
-    if request.post?
-      WorkflowTransition.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
-      (params[:issue_status] || []).each { |status_id, transitions|
-        transitions.each { |new_status_id, options|
-          author = options.is_a?(Array) && options.include?('author') && !options.include?('always')
-          assignee = options.is_a?(Array) && options.include?('assignee') && !options.include?('always')
-          WorkflowTransition.create(:role_id => @role.id, :tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee)
-        }
-      }
-      if @role.save
-        redirect_to :action => 'edit', :role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only]
-        return
-      end
-    end
-
-    @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
-    if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
-      @statuses = @tracker.issue_statuses
-    end
-    @statuses ||= IssueStatus.sorted.all
-
-    if @tracker && @role && @statuses.any?
-      workflows = WorkflowTransition.where(:role_id => @role.id, :tracker_id => @tracker.id).all
-      @workflows = {}
-      @workflows['always'] = workflows.select {|w| !w.author && !w.assignee}
-      @workflows['author'] = workflows.select {|w| w.author}
-      @workflows['assignee'] = workflows.select {|w| w.assignee}
-    end
-  end
-
-  def permissions
-    @role = Role.find_by_id(params[:role_id]) if params[:role_id]
-    @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
-
-    if request.post? && @role && @tracker
-      WorkflowPermission.replace_permissions(@tracker, @role, params[:permissions] || {})
-      redirect_to :action => 'permissions', :role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only]
-      return
-    end
-
-    @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
-    if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
-      @statuses = @tracker.issue_statuses
-    end
-    @statuses ||= IssueStatus.sorted.all
-
-    if @role && @tracker
-      @fields = (Tracker::CORE_FIELDS_ALL - @tracker.disabled_core_fields).map {|field| [field, l("field_"+field.sub(/_id$/, ''))]}
-      @custom_fields = @tracker.custom_fields
-
-      @permissions = WorkflowPermission.where(:tracker_id => @tracker.id, :role_id => @role.id).all.inject({}) do |h, w|
-        h[w.old_status_id] ||= {}
-        h[w.old_status_id][w.field_name] = w.rule
-        h
-      end
-      @statuses.each {|status| @permissions[status.id] ||= {}}
-    end
-  end
-
-  def copy
-
-    if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
-      @source_tracker = nil
-    else
-      @source_tracker = Tracker.find_by_id(params[:source_tracker_id].to_i)
-    end
-    if params[:source_role_id].blank? || params[:source_role_id] == 'any'
-      @source_role = nil
-    else
-      @source_role = Role.find_by_id(params[:source_role_id].to_i)
-    end
-
-    @target_trackers = params[:target_tracker_ids].blank? ? nil : Tracker.find_all_by_id(params[:target_tracker_ids])
-    @target_roles = params[:target_role_ids].blank? ? nil : Role.find_all_by_id(params[:target_role_ids])
-
-    if request.post?
-      if params[:source_tracker_id].blank? || params[:source_role_id].blank? || (@source_tracker.nil? && @source_role.nil?)
-        flash.now[:error] = l(:error_workflow_copy_source)
-      elsif @target_trackers.nil? || @target_roles.nil?
-        flash.now[:error] = l(:error_workflow_copy_target)
-      else
-        WorkflowRule.copy(@source_tracker, @source_role, @target_trackers, @target_roles)
-        flash[:notice] = l(:notice_successful_update)
-        redirect_to :action => 'copy', :source_tracker_id => @source_tracker, :source_role_id => @source_role
-      end
-    end
-  end
-
-  private
-
-  def find_roles
-    @roles = Role.sorted.all
-  end
-
-  def find_trackers
-    @trackers = Tracker.sorted.all
-  end
-end

app/helpers/account_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/admin_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -19,9 +17,7 @@
 
 module AdminHelper
   def project_status_options_for_select(selected)
-    options_for_select([[l(:label_all), ''],
+    options_for_select([[l(:label_all), "*"], 
-                        [l(:project_status_active), '1'],
+                        [l(:status_active), 1]], selected)
-                        [l(:project_status_closed), '5'],
-                        [l(:project_status_archived), '9']], selected.to_s)
   end
 end

app/helpers/attachments_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,30 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module AttachmentsHelper
-  # Displays view/delete links to the attachments of the given object
+  # displays the links to a collection of attachments
-  # Options:
+  def link_to_attachments(attachments, options = {})
-  #   :author -- author names are not displayed if set to false
+    if attachments.any?
-  #   :thumbails -- display thumbnails if enabled in settings
+      render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
-  def link_to_attachments(container, options = {})
-    options.assert_valid_keys(:author, :thumbnails)
-
-    if container.attachments.any?
-      options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)
-      render :partial => 'attachments/links',
-        :locals => {:attachments => container.attachments, :options => options, :thumbnails => (options[:thumbnails] && Setting.thumbnails_enabled?)}
     end
   end
   
-  def render_api_attachment(attachment, api)
+  def to_utf8(str)
-    api.attachment do
+    str
-      api.id attachment.id
-      api.filename attachment.filename
-      api.filesize attachment.filesize
-      api.content_type attachment.content_type
-      api.description attachment.description
-      api.content_url url_for(:controller => 'attachments', :action => 'download', :id => attachment, :filename => attachment.filename, :only_path => false)
-      api.author(:id => attachment.author.id, :name => attachment.author.name) if attachment.author
-      api.created_on attachment.created_on
-    end
   end
 end

app/helpers/auth_sources_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,7 +16,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module AuthSourcesHelper
-  def auth_source_partial_name(auth_source)
-    "form_#{auth_source.class.name.underscore}"
-  end
 end

app/helpers/boards_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,24 +16,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module BoardsHelper
-  def board_breadcrumb(item)
-    board = item.is_a?(Message) ? item.board : item
-    links = [link_to(l(:label_board_plural), project_boards_path(item.project))]
-    boards = board.ancestors.reverse
-    if item.is_a?(Message)
-      boards << board
-    end
-    links += boards.map {|ancestor| link_to(h(ancestor.name), project_board_path(ancestor.project, ancestor))}
-    breadcrumb links
-  end
-
-  def boards_options_for_select(boards)
-    options = []
-    Board.board_tree(boards) do |board, level|
-      label = (level > 0 ? '&nbsp;' * 2 * level + '&#187; ' : '').html_safe
-      label << board.name
-      options << [label, board.id]
-    end
-    options
-  end
 end

app/helpers/calendars_helper.rb

@@ -1,58 +0,0 @@
-# encoding: utf-8
-#
-# Redmine - project management software
-# Copyright (C) 2006-2012  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.
-
-module CalendarsHelper
-  def link_to_previous_month(year, month, options={})
-    target_year, target_month = if month == 1
-                                  [year - 1, 12]
-                                else
-                                  [year, month - 1]
-                                end
-
-    name = if target_month == 12
-             "#{month_name(target_month)} #{target_year}"
-           else
-             "#{month_name(target_month)}"
-           end
-
-    # \xc2\xab(utf-8) = «
-    link_to_month(("\xc2\xab " + name), target_year, target_month, options)
-  end
-
-  def link_to_next_month(year, month, options={})
-    target_year, target_month = if month == 12
-                                  [year + 1, 1]
-                                else
-                                  [year, month + 1]
-                                end
-
-    name = if target_month == 1
-             "#{month_name(target_month)} #{target_year}"
-           else
-             "#{month_name(target_month)}"
-           end
-
-    # \xc2\xbb(utf-8) = »
-    link_to_month((name + " \xc2\xbb"), target_year, target_month, options)
-  end
-
-  def link_to_month(link_name, year, month, options={})
-    link_to_content_update(h(link_name), params.merge(:year => year, :month => month))
-  end
-end

app/helpers/context_menus_helper.rb

@@ -1,43 +0,0 @@
-# encoding: utf-8
-#
-# Redmine - project management software
-# Copyright (C) 2006-2012  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.
-
-module ContextMenusHelper
-  def context_menu_link(name, url, options={})
-    options[:class] ||= ''
-    if options.delete(:selected)
-      options[:class] << ' icon-checked disabled'
-      options[:disabled] = true
-    end
-    if options.delete(:disabled)
-      options.delete(:method)
-      options.delete(:data)
-      options[:onclick] = 'return false;'
-      options[:class] << ' disabled'
-      url = '#'
-    end
-    link_to h(name), url, options
-  end
-
-  def bulk_update_custom_field_context_menu_link(field, text, value)
-    context_menu_link h(text),
-      {:controller => 'issues', :action => 'bulk_update', :ids => @issue_ids, :issue => {'custom_field_values' => {field.id => value}}, :back_url => @back},
-      :method => :post,
-      :selected => (@issue && @issue.custom_field_value(field) == value)
-  end
-end

app/helpers/custom_fields_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -20,90 +18,48 @@
 module CustomFieldsHelper
 
   def custom_fields_tabs
-    CustomField::CUSTOM_FIELDS_TABS
+    tabs = [{:name => 'IssueCustomField', :label => :label_issue_plural},
+            {:name => 'TimeEntryCustomField', :label => :label_spent_time},
+            {:name => 'ProjectCustomField', :label => :label_project_plural},
+            {:name => 'UserCustomField', :label => :label_user_plural}
+            ]
   end
   
   # Return custom field html tag corresponding to its format
   def custom_field_tag(name, custom_value)	
     custom_field = custom_value.custom_field
     field_name = "#{name}[custom_field_values][#{custom_field.id}]"
-    field_name << "[]" if custom_field.multiple?
     field_id = "#{name}_custom_field_values_#{custom_field.id}"
     
-    tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
+    case custom_field.field_format
-
-    field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
-    case field_format.try(:edit_as)
     when "date"
-      text_field_tag(field_name, custom_value.value, tag_options.merge(:size => 10)) +
+      text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) + 
       calendar_for(field_id)
     when "text"
-      text_area_tag(field_name, custom_value.value, tag_options.merge(:rows => 3))
+      text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
     when "bool"
-      hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, tag_options)
+      check_box_tag(field_name, '1', custom_value.true?, :id => field_id) + hidden_field_tag(field_name, '0')
     when "list"
-      blank_option = ''.html_safe
+      blank_option = custom_field.is_required? ?
-      unless custom_field.multiple?
+                       (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') : 
-        if custom_field.is_required?
+                       '<option></option>'
-          unless custom_field.default_value.present?
+      select_tag(field_name, blank_option + options_for_select(custom_field.possible_values, custom_value.value), :id => field_id)
-            blank_option = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---", :value => '')
-          end
-        else
-          blank_option = content_tag('option')
-        end
-      end
-      s = select_tag(field_name, blank_option + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value),
-        tag_options.merge(:multiple => custom_field.multiple?))
-      if custom_field.multiple?
-        s << hidden_field_tag(field_name, '')
-      end
-      s
     else
-      text_field_tag(field_name, custom_value.value, tag_options)
+      text_field_tag(field_name, custom_value.value, :id => field_id)
     end
   end
   
   # Return custom field label tag
-  def custom_field_label_tag(name, custom_value, options={})
+  def custom_field_label_tag(name, custom_value)
-    required = options[:required] || custom_value.custom_field.is_required?
+    content_tag "label", custom_value.custom_field.name +
-
+	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
-    content_tag "label", h(custom_value.custom_field.name) +
+	:for => "#{name}_custom_field_values_#{custom_value.custom_field.id}",
-      (required ? " <span class=\"required\">*</span>".html_safe : ""),
+	:class => (custom_value.errors.empty? ? nil : "error" )
-      :for => "#{name}_custom_field_values_#{custom_value.custom_field.id}"
   end
   
   # Return custom field tag with its label tag
-  def custom_field_tag_with_label(name, custom_value, options={})
+  def custom_field_tag_with_label(name, custom_value)
-    custom_field_label_tag(name, custom_value, options) + custom_field_tag(name, custom_value)
+    custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
-  end
-
-  def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil)
-    field_name = "#{name}[custom_field_values][#{custom_field.id}]"
-    field_name << "[]" if custom_field.multiple?
-    field_id = "#{name}_custom_field_values_#{custom_field.id}"
-
-    tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
-
-    field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
-    case field_format.try(:edit_as)
-      when "date"
-        text_field_tag(field_name, '', tag_options.merge(:size => 10)) +
-        calendar_for(field_id)
-      when "text"
-        text_area_tag(field_name, '', tag_options.merge(:rows => 3))
-      when "bool"
-        select_tag(field_name, options_for_select([[l(:label_no_change_option), ''],
-                                                   [l(:general_text_yes), '1'],
-                                                   [l(:general_text_no), '0']]), tag_options)
-      when "list"
-        options = []
-        options << [l(:label_no_change_option), ''] unless custom_field.multiple?
-        options << [l(:label_none), '__none__'] unless custom_field.is_required?
-        options += custom_field.possible_values_options(projects)
-        select_tag(field_name, options_for_select(options), tag_options.merge(:multiple => custom_field.multiple?))
-      else
-        text_field_tag(field_name, '', tag_options)
-    end
   end
 
   # Return a string used to display a custom value
@@ -114,36 +70,19 @@ module CustomFieldsHelper
   
   # Return a string used to display a custom value
   def format_value(value, field_format)
-    if value.is_a?(Array)
+    return "" unless value && !value.empty?
-      value.collect {|v| format_value(v, field_format)}.compact.sort.join(', ')
+    case field_format
+    when "date"
+      begin; format_date(value.to_date); rescue; value end
+    when "bool"
+      l_YesNo(value == "1")
     else
-      Redmine::CustomFieldFormat.format_value(value, field_format)
+      value
     end
   end
 
   # Return an array of custom field formats which can be used in select_tag
-  def custom_field_formats_for_select(custom_field)
+  def custom_field_formats_for_select
-    Redmine::CustomFieldFormat.as_select(custom_field.class.customized_class.name)
+    CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
-  end
-
-  # Renders the custom_values in api views
-  def render_api_custom_values(custom_values, api)
-    api.array :custom_fields do
-      custom_values.each do |custom_value|
-        attrs = {:id => custom_value.custom_field_id, :name => custom_value.custom_field.name}
-        attrs.merge!(:multiple => true) if custom_value.custom_field.multiple?
-        api.custom_field attrs do
-          if custom_value.value.is_a?(Array)
-            api.array :value do
-              custom_value.value.each do |value|
-                api.value value unless value.blank?
-              end
-            end
-          else
-            api.value custom_value.value
-          end
-        end
-      end
-    end unless custom_values.empty?
   end
 end

app/helpers/documents_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/enumerations_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/gantt_helper.rb

@@ -1,43 +0,0 @@
-# encoding: utf-8
-#
-# Redmine - project management software
-# Copyright (C) 2006-2012  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.
-
-module GanttHelper
-
-  def gantt_zoom_link(gantt, in_or_out)
-    case in_or_out
-    when :in
-      if gantt.zoom < 4
-        link_to_content_update l(:text_zoom_in),
-          params.merge(gantt.params.merge(:zoom => (gantt.zoom+1))),
-          :class => 'icon icon-zoom-in'
-      else
-        content_tag('span', l(:text_zoom_in), :class => 'icon icon-zoom-in').html_safe
-      end
-
-    when :out
-      if gantt.zoom > 1
-        link_to_content_update l(:text_zoom_out),
-          params.merge(gantt.params.merge(:zoom => (gantt.zoom-1))),
-          :class => 'icon icon-zoom-out'
-      else
-        content_tag('span', l(:text_zoom_out), :class => 'icon icon-zoom-out').html_safe
-      end
-    end
-  end
-end

app/helpers/groups_helper.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-#
-# Redmine - project management software
-# Copyright (C) 2006-2012  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.
-
-module GroupsHelper
-  def group_settings_tabs
-    tabs = [{:name => 'general', :partial => 'groups/general', :label => :label_general},
-            {:name => 'users', :partial => 'groups/users', :label => :label_user_plural},
-            {:name => 'memberships', :partial => 'groups/memberships', :label => :label_project_plural}
-            ]
-  end
-end

app/helpers/ifpdf_helper.rb

@@ -0,0 +1,85 @@
+# 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.
+
+require 'iconv'
+require 'rfpdf/chinese'
+
+module IfpdfHelper  
+  
+  class IFPDF < FPDF
+    include GLoc
+    attr_accessor :footer_date
+    
+    def initialize(lang)
+      super()
+      set_language_if_valid lang
+      case current_language.to_s
+      when 'ja'
+        extend(PDF_Japanese)
+        AddSJISFont()
+        @font_for_content = 'SJIS'
+        @font_for_footer = 'SJIS'
+      when 'zh'
+        extend(PDF_Chinese)
+        AddGBFont()
+        @font_for_content = 'GB'
+        @font_for_footer = 'GB'
+      when 'zh-tw'
+        extend(PDF_Chinese)
+        AddBig5Font()
+        @font_for_content = 'Big5'
+        @font_for_footer = 'Big5'
+      else
+        @font_for_content = 'Arial'
+        @font_for_footer = 'Helvetica'              
+      end
+      SetCreator("redMine #{Redmine::VERSION}")
+      SetFont(@font_for_content)
+    end
+    
+    def SetFontStyle(style, size)
+      SetFont(@font_for_content, style, size)
+    end
+      
+    def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
+      @ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
+      # these quotation marks are not correctly rendered in the pdf
+      txt = txt.gsub(/[“”]/, '"') if txt
+      txt = begin
+        # 0x5c char handling
+        txtar = txt.split('\\')
+        txtar << '' if txt[-1] == ?\\
+        txtar.collect {|x| @ic.iconv(x)}.join('\\').gsub(/\\/, "\\\\\\\\")
+      rescue
+        txt
+      end || ''
+      super w,h,txt,border,ln,align,fill,link
+    end
+    
+    def Footer
+      SetFont(@font_for_footer, 'I', 8)
+      SetY(-15)
+      SetX(15)
+      Cell(0, 5, @footer_date, 0, 0, 'L')
+      SetY(-15)
+      SetX(-30)
+      Cell(0, 5, PageNo().to_s + '/{nb}', 0, 0, 'C')
+    end
+    
+  end
+
+end

app/helpers/issue_categories_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/issue_relations_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/issue_statuses_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/issues_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -17,273 +15,70 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'csv'
+
 module IssuesHelper
   include ApplicationHelper
 
-  def issue_list(issues, &block)
-    ancestors = []
-    issues.each do |issue|
-      while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
-        ancestors.pop
-      end
-      yield issue, ancestors.size
-      ancestors << issue unless issue.leaf?
-    end
-  end
-
-  # Renders a HTML/CSS tooltip
-  #
-  # To use, a trigger div is needed.  This is a div with the class of "tooltip"
-  # that contains this method wrapped in a span with the class of "tip"
-  #
-  #    <div class="tooltip"><%= link_to_issue(issue) %>
-  #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
-  #    </div>
-  #
   def render_issue_tooltip(issue)
-    @cached_label_status ||= l(:field_status)
     @cached_label_start_date ||= l(:field_start_date)
     @cached_label_due_date ||= l(:field_due_date)
     @cached_label_assigned_to ||= l(:field_assigned_to)
     @cached_label_priority ||= l(:field_priority)
-    @cached_label_project ||= l(:field_project)
     
-    link_to_issue(issue) + "<br /><br />".html_safe +
+    link_to_issue(issue) + ": #{h(issue.subject)}<br /><br />" +
-      "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
+      "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />" +
-      "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
+      "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />" +
-      "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
+      "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
-      "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
+      "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
-      "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
-      "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
-  end
-
-  def issue_heading(issue)
-    h("#{issue.tracker} ##{issue.id}")
-  end
-
-  def render_issue_subject_with_tree(issue)
-    s = ''
-    ancestors = issue.root? ? [] : issue.ancestors.visible.all
-    ancestors.each do |ancestor|
-      s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
-    end
-    s << '<div>'
-    subject = h(issue.subject)
-    if issue.is_private?
-      subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
-    end
-    s << content_tag('h3', subject)
-    s << '</div>' * (ancestors.size + 1)
-    s.html_safe
-  end
-
-  def render_descendants_tree(issue)
-    s = '<form><table class="list issues">'
-    issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
-      css = "issue issue-#{child.id} hascontextmenu"
-      css << " idnt idnt-#{level}" if level > 0
-      s << content_tag('tr',
-             content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
-             content_tag('td', link_to_issue(child, :truncate => 60, :project => (issue.project_id != child.project_id)), :class => 'subject') +
-             content_tag('td', h(child.status)) +
-             content_tag('td', link_to_user(child.assigned_to)) +
-             content_tag('td', progress_bar(child.done_ratio, :width => '80px')),
-             :class => css)
-    end
-    s << '</table></form>'
-    s.html_safe
-  end
-
-  # Returns a link for adding a new subtask to the given issue
-  def link_to_new_subtask(issue)
-    attrs = {
-      :tracker_id => issue.tracker,
-      :parent_issue_id => issue
-    }
-    link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
-  end
-
-  class IssueFieldsRows
-    include ActionView::Helpers::TagHelper
-
-    def initialize
-      @left = []
-      @right = []
-    end
-
-    def left(*args)
-      args.any? ? @left << cells(*args) : @left
-    end
-
-    def right(*args)
-      args.any? ? @right << cells(*args) : @right
-    end
-
-    def size
-      @left.size > @right.size ? @left.size : @right.size
-    end
-
-    def to_html
-      html = ''.html_safe
-      blank = content_tag('th', '') + content_tag('td', '')
-      size.times do |i|
-        left = @left[i] || blank
-        right = @right[i] || blank
-        html << content_tag('tr', left + right)
-      end
-      html
-    end
-
-    def cells(label, text, options={})
-      content_tag('th', "#{label}:", options) + content_tag('td', text, options)
-    end
-  end
-
-  def issue_fields_rows
-    r = IssueFieldsRows.new
-    yield r
-    r.to_html
-  end
-
-  def render_custom_fields_rows(issue)
-    return if issue.custom_field_values.empty?
-    ordered_values = []
-    half = (issue.custom_field_values.size / 2.0).ceil
-    half.times do |i|
-      ordered_values << issue.custom_field_values[i]
-      ordered_values << issue.custom_field_values[i + half]
-    end
-    s = "<tr>\n"
-    n = 0
-    ordered_values.compact.each do |value|
-      s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
-      s << "\t<th>#{ h(value.custom_field.name) }:</th><td>#{ simple_format_without_paragraph(h(show_value(value))) }</td>\n"
-      n += 1
-    end
-    s << "</tr>\n"
-    s.html_safe
-  end
-
-  def issues_destroy_confirmation_message(issues)
-    issues = [issues] unless issues.is_a?(Array)
-    message = l(:text_issues_destroy_confirmation)
-    descendant_count = issues.inject(0) {|memo, i| memo += (i.right - i.left - 1)/2}
-    if descendant_count > 0
-      issues.each do |issue|
-        next if issue.root?
-        issues.each do |other_issue|
-          descendant_count -= 1 if issue.is_descendant_of?(other_issue)
-        end
-      end
-      if descendant_count > 0
-        message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
-      end
-    end
-    message
   end
   
   def sidebar_queries
     unless @sidebar_queries
-      @sidebar_queries = Query.visible.all(
+      # User can see public queries and his own queries
-        :order => "#{Query.table_name}.name ASC",
+      visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
-        # Project specific queries and global queries
+      # Project specific queries and global queries
-        :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
+      visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
-      )
+      @sidebar_queries = Query.find(:all, 
+                                    :order => "name ASC",
+                                    :conditions => visible.conditions)
     end
     @sidebar_queries
   end
 
-  def query_links(title, queries)
+  def show_detail(detail, no_html=false)
-    # links to #index on issues/show
-    url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
-
-    content_tag('h3', h(title)) +
-      queries.collect {|query|
-          css = 'query'
-          css << ' selected' if query == @query
-          link_to(h(query.name), url_params.merge(:query_id => query), :class => css)
-        }.join('<br />').html_safe
-  end
-
-  def render_sidebar_queries
-    out = ''.html_safe
-    queries = sidebar_queries.select {|q| !q.is_public?}
-    out << query_links(l(:label_my_queries), queries) if queries.any?
-    queries = sidebar_queries.select {|q| q.is_public?}
-    out << query_links(l(:label_query_plural), queries) if queries.any?
-    out
-  end
-
-  # Returns the textual representation of a journal details
-  # as an array of strings
-  def details_to_strings(details, no_html=false, options={})
-    options[:only_path] = (options[:only_path] == false ? false : true)
-    strings = []
-    values_by_field = {}
-    details.each do |detail|
-      if detail.property == 'cf'
-        field_id = detail.prop_key
-        field = CustomField.find_by_id(field_id)
-        if field && field.multiple?
-          values_by_field[field_id] ||= {:added => [], :deleted => []}
-          if detail.old_value
-            values_by_field[field_id][:deleted] << detail.old_value
-          end
-          if detail.value
-            values_by_field[field_id][:added] << detail.value
-          end
-          next
-        end
-      end
-      strings << show_detail(detail, no_html, options)
-    end
-    values_by_field.each do |field_id, changes|
-      detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)
-      if changes[:added].any?
-        detail.value = changes[:added]
-        strings << show_detail(detail, no_html, options)
-      elsif changes[:deleted].any?
-        detail.old_value = changes[:deleted]
-        strings << show_detail(detail, no_html, options)
-      end
-    end
-    strings
-  end
-
-  # Returns the textual representation of a single journal detail
-  def show_detail(detail, no_html=false, options={})
-    multiple = false
     case detail.property
     when 'attr'
-      field = detail.prop_key.to_s.gsub(/\_id$/, "")
+      label = l(("field_" + detail.prop_key.to_s.gsub(/\_id$/, "")).to_sym)   
-      label = l(("field_" + field).to_sym)
       case detail.prop_key
       when 'due_date', 'start_date'
         value = format_date(detail.value.to_date) if detail.value
         old_value = format_date(detail.old_value.to_date) if detail.old_value
-
+      when 'project_id'
-      when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
+        p = Project.find_by_id(detail.value) and value = p.name if detail.value
-            'priority_id', 'category_id', 'fixed_version_id'
+        p = Project.find_by_id(detail.old_value) and old_value = p.name if detail.old_value
-        value = find_name_by_reflection(field, detail.value)
+      when 'status_id'
-        old_value = find_name_by_reflection(field, detail.old_value)
+        s = IssueStatus.find_by_id(detail.value) and value = s.name if detail.value
-
+        s = IssueStatus.find_by_id(detail.old_value) and old_value = s.name if detail.old_value
-      when 'estimated_hours'
+      when 'tracker_id'
-        value = "%0.02f" % detail.value.to_f unless detail.value.blank?
+        t = Tracker.find_by_id(detail.value) and value = t.name if detail.value
-        old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
+        t = Tracker.find_by_id(detail.old_value) and old_value = t.name if detail.old_value
-
+      when 'assigned_to_id'
-      when 'parent_id'
+        u = User.find_by_id(detail.value) and value = u.name if detail.value
-        label = l(:field_parent_issue)
+        u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value
-        value = "##{detail.value}" unless detail.value.blank?
+      when 'priority_id'
-        old_value = "##{detail.old_value}" unless detail.old_value.blank?
+        e = Enumeration.find_by_id(detail.value) and value = e.name if detail.value
-
+        e = Enumeration.find_by_id(detail.old_value) and old_value = e.name if detail.old_value
-      when 'is_private'
+      when 'category_id'
-        value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
+        c = IssueCategory.find_by_id(detail.value) and value = c.name if detail.value
-        old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
+        c = IssueCategory.find_by_id(detail.old_value) and old_value = c.name if detail.old_value
+      when 'fixed_version_id'
+        v = Version.find_by_id(detail.value) and value = v.name if detail.value
+        v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
       end
     when 'cf'
       custom_field = CustomField.find_by_id(detail.prop_key)
       if custom_field
-        multiple = custom_field.multiple?
         label = custom_field.name
         value = format_value(detail.value, custom_field.field_format) if detail.value
         old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
@@ -291,8 +86,8 @@ module IssuesHelper
     when 'attachment'
       label = l(:label_attachment)
     end
-    call_hook(:helper_issues_show_detail_after_setting,
+
-              {:detail => detail, :label => label, :value => value, :old_value => old_value })
+    Redmine::Plugin::Hook::Manager.call_hook(:issues_helper_show_details, {:detail => detail, :label => label, :value => value, :old_value => old_value })
     
     label ||= detail.prop_key
     value ||= detail.value
@@ -301,110 +96,91 @@ module IssuesHelper
     unless no_html
       label = content_tag('strong', label)
       old_value = content_tag("i", h(old_value)) if detail.old_value
-      old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
+      old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
-      if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
+      if detail.property == 'attachment' && !value.blank? && a = Attachment.find_by_id(detail.prop_key)
         # Link to the attachment if it has not been removed
-        value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
+        value = link_to_attachment(a)
-        if options[:only_path] != false && atta.is_text?
-          value += link_to(
-                       image_tag('magnifier.png'),
-                       :controller => 'attachments', :action => 'show',
-                       :id => atta, :filename => atta.filename
-                     )
-        end
       else
         value = content_tag("i", h(value)) if value
       end
     end
     
-    if detail.property == 'attr' && detail.prop_key == 'description'
+    if !detail.value.blank?
-      s = l(:text_journal_changed_no_detail, :label => label)
-      unless no_html
-        diff_link = link_to 'diff',
-          {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
-           :detail_id => detail.id, :only_path => options[:only_path]},
-          :title => l(:label_view_diff)
-        s << " (#{ diff_link })"
-      end
-      s.html_safe
-    elsif detail.value.present?
       case detail.property
       when 'attr', 'cf'
-        if detail.old_value.present?
+        if !detail.old_value.blank?
-          l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
+          label + " " + l(:text_journal_changed, old_value, value)
-        elsif multiple
-          l(:text_journal_added, :label => label, :value => value).html_safe
         else
-          l(:text_journal_set_to, :label => label, :value => value).html_safe
+          label + " " + l(:text_journal_set_to, value)
         end
       when 'attachment'
-        l(:text_journal_added, :label => label, :value => value).html_safe
+        "#{label} #{value} #{l(:label_added)}"
       end
     else
-      l(:text_journal_deleted, :label => label, :old => old_value).html_safe
+      case detail.property
-    end
+      when 'attr', 'cf'
-  end
+        label + " " + l(:text_journal_deleted) + " (#{old_value})"
-
+      when 'attachment'
-  # Find the name of an associated record stored in the field attribute
+        "#{label} #{old_value} #{l(:label_deleted)}"
-  def find_name_by_reflection(field, id)
-    association = Issue.reflect_on_association(field.to_sym)
-    if association
-      record = association.class_name.constantize.find_by_id(id)
-      return record.name if record
-    end
-  end
-
-  # Renders issue children recursively
-  def render_api_issue_children(issue, api)
-    return if issue.leaf?
-    api.array :children do
-      issue.children.each do |child|
-        api.issue(:id => child.id) do
-          api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
-          api.subject child.subject
-          render_api_issue_children(child, api)
-        end
       end
     end
   end
   
-  def issues_to_csv(issues, project, query, options={})
+  def issues_to_csv(issues, project = nil)
+    ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
     decimal_separator = l(:general_csv_decimal_separator)
-    encoding = l(:general_csv_encoding)
+    export = StringIO.new
-    columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
+    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
-    if options[:description]
-      if description = query.available_columns.detect {|q| q.name == :description}
-        columns << description
-      end
-    end
-
-    export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
       # csv header fields
-      csv << [ "#" ] + columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
+      headers = [ "#",
-
+                  l(:field_status), 
+                  l(:field_project),
+                  l(:field_tracker),
+                  l(:field_priority),
+                  l(:field_subject),
+                  l(:field_assigned_to),
+                  l(:field_category),
+                  l(:field_fixed_version),
+                  l(:field_author),
+                  l(:field_start_date),
+                  l(:field_due_date),
+                  l(:field_done_ratio),
+                  l(:field_estimated_hours),
+                  l(:field_created_on),
+                  l(:field_updated_on)
+                  ]
+      # Export project custom fields if project is given
+      # otherwise export custom fields marked as "For all projects"
+      custom_fields = project.nil? ? IssueCustomField.for_all : project.all_issue_custom_fields
+      custom_fields.each {|f| headers << f.name}
+      # Description in the last column
+      headers << l(:field_description)
+      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       # csv lines
       issues.each do |issue|
-        col_values = columns.collect do |column|
+        fields = [issue.id,
-          s = if column.is_a?(QueryCustomFieldColumn)
+                  issue.status.name, 
-            cv = issue.custom_field_values.detect {|v| v.custom_field_id == column.custom_field.id}
+                  issue.project.name,
-            show_value(cv)
+                  issue.tracker.name, 
-          else
+                  issue.priority.name,
-            value = column.value(issue)
+                  issue.subject,
-            if value.is_a?(Date)
+                  issue.assigned_to,
-              format_date(value)
+                  issue.category,
-            elsif value.is_a?(Time)
+                  issue.fixed_version,
-              format_time(value)
+                  issue.author.name,
-            elsif value.is_a?(Float)
+                  format_date(issue.start_date),
-              ("%.2f" % value).gsub('.', decimal_separator)
+                  format_date(issue.due_date),
-            else
+                  issue.done_ratio,
-              value
+                  issue.estimated_hours.to_s.gsub('.', decimal_separator),
-            end
+                  format_time(issue.created_on),  
-          end
+                  format_time(issue.updated_on)
-          s.to_s
+                  ]
-        end
+        custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
-        csv << [ issue.id.to_s ] + col_values.collect {|c| Redmine::CodesetUtil.from_utf8(c.to_s, encoding) }
+        fields << issue.description
+        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       end
     end
+    export.rewind
     export
   end
 end

app/helpers/journals_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2008  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,29 +16,25 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module JournalsHelper
-  def render_notes(issue, journal, options={})
+  def render_notes(journal, options={})
     content = ''
-    editable = User.current.logged? && (User.current.allowed_to?(:edit_issue_notes, issue.project) || (journal.user == User.current && User.current.allowed_to?(:edit_own_issue_notes, issue.project)))
+    editable = journal.editable_by?(User.current)
     links = []
     if !journal.notes.blank?
-      links << link_to(image_tag('comment.png'),
-                       {:controller => 'journals', :action => 'new', :id => issue, :journal_id => journal},
-                       :remote => true,
-                       :method => 'post',
-                       :title => l(:button_quote)) if options[:reply_links]
       links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", 
-                                             { :controller => 'journals', :action => 'edit', :id => journal, :format => 'js' },
+                                             { :controller => 'journals', :action => 'edit', :id => journal },
                                                 :title => l(:button_edit)) if editable
+      links << link_to_remote(image_tag('comment.png'),
+                              { :url => {:controller => 'issues', :action => 'reply', :id => journal.journalized, :journal_id => journal} },
+                              :title => l(:button_reply)) if options[:reply_links]
     end
-    content << content_tag('div', links.join(' ').html_safe, :class => 'contextual') unless links.empty?
+    content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
     content << textilizable(journal, :notes)
-    css_classes = "wiki"
+    content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'wiki editable' : 'wiki'))
-    css_classes << " editable" if editable
-    content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes)
   end
   
   def link_to_in_place_notes_editor(text, field_id, url, options={})
-    onclick = "$.ajax({url: '#{url_for(url)}', type: 'get'}); return false;"
+    onclick = "new Ajax.Request('#{url_for(url)}', {asynchronous:true, evalScripts:true, method:'get'}); return false;"
     link_to text, '#', options.merge(:onclick => onclick)
   end
 end

app/helpers/mail_handler_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2008  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/members_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/messages_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,4 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module MessagesHelper
+
+  def link_to_message(message)
+    return '' unless message
+    link_to h(truncate(message.subject, 60)), :controller => 'messages',
+                                           :action => 'show',
+                                           :board_id => message.board_id,
+                                           :id => message.root,
+                                           :anchor => (message.parent_id ? "message-#{message.id}" : nil)
+  end
 end

app/helpers/my_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/news_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/projects_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -20,7 +18,19 @@
 module ProjectsHelper
   def link_to_version(version, options = {})
     return '' unless version && version.is_a?(Version)
-    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, options
+    link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options
+  end
+  
+  def format_activity_title(text)
+    h(truncate_single_line(text, 100))
+  end
+  
+  def format_activity_day(date)
+    date == Date.today ? l(:label_today).titleize : format_date(date)
+  end
+  
+  def format_activity_description(text)
+    h(truncate(text.to_s, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
   end
   
   def project_settings_tabs
@@ -30,54 +40,159 @@ module ProjectsHelper
             {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
             {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
             {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
-            {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural},
+            {:name => 'repository', :action => :manage_repository, :partial => 'projects/settings/repository', :label => :label_repository},
-            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
+            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}
-            {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
             ]
     tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}     
   end
   
-  def parent_project_select_tag(project)
+  # Generates a gantt image
-    selected = project.parent
+  # Only defined if RMagick is avalaible
-    # retrieve the requested parent project
+  def gantt_image(events, date_from, months, zoom)
-    parent_id = (params[:project] && params[:project][:parent_id]) || params[:parent_id]
+    date_to = (date_from >> months)-1    
-    if parent_id
+    show_weeks = zoom > 1
-      selected = (parent_id.blank? ? nil : Project.find(parent_id))
+    show_days = zoom > 2
+    
+    subject_width = 320
+    header_heigth = 18
+    # width of one day in pixels
+    zoom = zoom*2
+    g_width = (date_to - date_from + 1)*zoom
+    g_height = 20 * events.length + 20
+    headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
+    height = g_height + headers_heigth
+        
+    imgl = Magick::ImageList.new
+    imgl.new_image(subject_width+g_width+1, height)
+    gc = Magick::Draw.new
+    
+    # Subjects
+    top = headers_heigth + 20
+    gc.fill('black')
+    gc.stroke('transparent')
+    gc.stroke_width(1)
+    events.each do |i|
+      gc.text(4, top + 2, (i.is_a?(Issue) ? i.subject : i.name))
+      top = top + 20
     end
 
-    options = ''
+    # Months headers
-    options << "<option value=''></option>" if project.allowed_parents.include?(nil)
+    month_f = date_from
-    options << project_tree_options_for_select(project.allowed_parents.compact, :selected => selected)
+    left = subject_width
-    content_tag('select', options.html_safe, :name => 'project[parent_id]', :id => 'project_parent_id')
+    months.times do 
-  end
+      width = ((month_f >> 1) - month_f) * zoom
+      gc.fill('white')
+      gc.stroke('grey')
+      gc.stroke_width(1)
+      gc.rectangle(left, 0, left + width, height)
+      gc.fill('black')
+      gc.stroke('transparent')
+      gc.stroke_width(1)
+      gc.text(left.round + 8, 14, "#{month_f.year}-#{month_f.month}")
+      left = left + width
+      month_f = month_f >> 1
+    end
     
-  # Renders the projects index
+    # Weeks headers
-  def render_project_hierarchy(projects)
+    if show_weeks
-    render_project_nested_lists(projects) do |project|
+    	left = subject_width
-      s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
+    	height = header_heigth
-      if project.description.present?
+    	if date_from.cwday == 1
-        s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description')
+    	    # date_from is monday
+            week_f = date_from
+    	else
+    	    # find next monday after date_from
+    		week_f = date_from + (7 - date_from.cwday + 1)
+    		width = (7 - date_from.cwday + 1) * zoom
+            gc.fill('white')
+            gc.stroke('grey')
+            gc.stroke_width(1)
+            gc.rectangle(left, header_heigth, left + width, 2*header_heigth + g_height-1)
+    		left = left + width
+    	end
+    	while week_f <= date_to
+    		width = (week_f + 6 <= date_to) ? 7 * zoom : (date_to - week_f + 1) * zoom
+            gc.fill('white')
+            gc.stroke('grey')
+            gc.stroke_width(1)
+            gc.rectangle(left.round, header_heigth, left.round + width, 2*header_heigth + g_height-1)
+            gc.fill('black')
+            gc.stroke('transparent')
+            gc.stroke_width(1)
+            gc.text(left.round + 2, header_heigth + 14, week_f.cweek.to_s)
+    		left = left + width
+    		week_f = week_f+7
+    	end
+    end
+    
+    # Days details (week-end in grey)
+    if show_days
+    	left = subject_width
+    	height = g_height + header_heigth - 1
+    	wday = date_from.cwday
+    	(date_to - date_from + 1).to_i.times do 
+          width =  zoom
+          gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
+          gc.stroke('grey')
+          gc.stroke_width(1)
+          gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
+          left = left + width
+          wday = wday + 1
+          wday = 1 if wday > 7
+    	end
+    end
+
+    # border
+    gc.fill('transparent')
+    gc.stroke('grey')
+    gc.stroke_width(1)
+    gc.rectangle(0, 0, subject_width+g_width, headers_heigth)
+    gc.stroke('black')
+    gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_heigth-1)
+        
+    # content
+    top = headers_heigth + 20
+    gc.stroke('transparent')
+    events.each do |i|      
+      if i.is_a?(Issue)       
+        i_start_date = (i.start_date >= date_from ? i.start_date : date_from )
+        i_end_date = (i.due_date <= date_to ? i.due_date : date_to )        
+        i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+        i_done_date = (i_done_date <= date_from ? date_from : i_done_date )
+        i_done_date = (i_done_date >= date_to ? date_to : i_done_date )        
+        i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
+        
+        i_left = subject_width + ((i_start_date - date_from)*zoom).floor 	
+        i_width = ((i_end_date - i_start_date + 1)*zoom).floor                  # total width of the issue
+        d_width = ((i_done_date - i_start_date)*zoom).floor                     # done width
+        l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor : 0 # delay width
+  
+        gc.fill('grey')
+        gc.rectangle(i_left, top, i_left + i_width, top - 6)
+        gc.fill('red')
+        gc.rectangle(i_left, top, i_left + l_width, top - 6) if l_width > 0
+        gc.fill('blue')
+        gc.rectangle(i_left, top, i_left + d_width, top - 6) if d_width > 0
+        gc.fill('black')
+        gc.text(i_left + i_width + 5,top + 1, "#{i.status.name} #{i.done_ratio}%")
+      else
+        i_left = subject_width + ((i.start_date - date_from)*zoom).floor
+        gc.fill('green')
+        gc.rectangle(i_left, top, i_left + 6, top - 6)        
+        gc.fill('black')
+        gc.text(i_left + 11, top + 1, i.name)
       end
-      s
+      top = top + 20
-    end
-  end
-
-  # Returns a set of options for a select field, grouped by project.
-  def version_options_for_select(versions, selected=nil)
-    grouped = Hash.new {|h,k| h[k] = []}
-    versions.each do |version|
-      grouped[version.project.name] << [version.name, version.id]
     end
     
-    if grouped.keys.size > 1
+    # today red line
-      grouped_options_for_select(grouped, selected && selected.id)
+    if Date.today >= date_from and Date.today <= date_to
-    else
+      gc.stroke('red')
-      options_for_select((grouped.values.first || []), selected && selected.id)
+      x = (Date.today-date_from+1)*zoom + subject_width
+      gc.line(x, headers_heigth, x, headers_heigth + g_height-1)      
     end    
-  end
     
-  def format_version_sharing(sharing)
+    gc.draw(imgl)
-    sharing = 'none' unless Version::VERSION_SHARINGS.include?(sharing)
+    imgl
-    l("label_version_sharing_#{sharing}")
+  end if Object.const_defined?(:Magick)
-  end
 end

app/helpers/queries_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,156 +16,38 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module QueriesHelper
-  def filters_options_for_select(query)
-    options_for_select(filters_options(query))
-  end
   
-  def filters_options(query)
+  def operators_for_select(filter_type)
-    options = [[]]
+    Query.operators_by_filter_type[filter_type].collect {|o| [l(Query.operators[o]), o]}
-    sorted_options = query.available_filters.sort do |a, b|
-      ord = 0
-      if !(a[1][:order] == 20 && b[1][:order] == 20) 
-        ord = a[1][:order] <=> b[1][:order]
-      else
-        cn = (CustomField::CUSTOM_FIELDS_NAMES.index(a[1][:field].class.name) <=>
-                CustomField::CUSTOM_FIELDS_NAMES.index(b[1][:field].class.name))
-        if cn != 0
-          ord = cn
-        else
-          f = (a[1][:field] <=> b[1][:field])
-          if f != 0
-            ord = f
-          else
-            # assigned_to or author 
-            ord = (a[0] <=> b[0])
-          end
-        end
-      end
-      ord
-    end
-    options += sorted_options.map do |field, field_options|
-      [field_options[:name], field]
-    end
-  end
-
-  def available_block_columns_tags(query)
-    tags = ''.html_safe
-    query.available_block_columns.each do |column|
-      tags << content_tag('label', check_box_tag('c[]', column.name.to_s, query.has_column?(column)) + " #{column.caption}", :class => 'inline')
-    end
-    tags
   end
   
   def column_header(column)
-    column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
+    column.sortable ? sort_header_tag(column.sortable, :caption => column.caption,
-                                                        :default_order => column.default_order) :
+                                                       :default_order => column.default_order) : 
-                      content_tag('th', h(column.caption))
+                      content_tag('th', column.caption)
   end
   
   def column_content(column, issue)
-    value = column.value(issue)
+    if column.is_a?(QueryCustomFieldColumn)
-    if value.is_a?(Array)
+      cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
-      value.collect {|v| column_value(column, issue, v)}.compact.join(', ').html_safe
+      show_value(cv)
     else
-      column_value(column, issue, value)
+      value = issue.send(column.name)
-    end
+      if value.is_a?(Date)
-  end
+        format_date(value)
-  
+      elsif value.is_a?(Time)
-  def column_value(column, issue, value)
+        format_time(value)
-    case value.class.name
-    when 'String'
-      if column.name == :subject
-        link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
-      elsif column.name == :description
-        issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
       else
-        h(value)
+        case column.name
-      end
+        when :subject
-    when 'Time'
+        h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
-      format_time(value)
+          link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
-    when 'Date'
+        when :done_ratio
-      format_date(value)
+          progress_bar(value, :width => '80px')
-    when 'Fixnum', 'Float'
+        else
-      if column.name == :done_ratio
+          h(value)
-        progress_bar(value, :width => '80px')
+        end
-      elsif  column.name == :spent_hours
-        sprintf "%.2f", value
-      else
-        h(value.to_s)
-      end
-    when 'User'
-      link_to_user value
-    when 'Project'
-      link_to_project value
-    when 'Version'
-      link_to(h(value), :controller => 'versions', :action => 'show', :id => value)
-    when 'TrueClass'
-      l(:general_text_Yes)
-    when 'FalseClass'
-      l(:general_text_No)
-    when 'Issue'
-      link_to_issue(value, :subject => false)
-    when 'IssueRelation'
-      other = value.other_issue(issue)
-      content_tag('span',
-        (l(value.label_for(issue)) + " " + link_to_issue(other, :subject => false, :tracker => false)).html_safe,
-        :class => value.css_classes_for(issue))
-    else
-      h(value)
-    end
-  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)
-      raise ::Unauthorized unless @query.visible?
-      @query.project = @project
-      session[:query] = {:id => @query.id, :project_id => @query.project_id}
-      sort_clear
-    elsif api_request? || 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
-      build_query_from_params
-      session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
-    else
-      # retrieve from session
-      @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
-      @query ||= Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
-      @query.project = @project
-    end
-  end
-
-  def retrieve_query_from_session
-    if session[:query]
-      if session[:query][:id]
-        @query = Query.find_by_id(session[:query][:id])
-        return unless @query
-      else
-        @query = Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
-      end
-      if session[:query].has_key?(:project_id)
-        @query.project_id = session[:query][:project_id]
-      else
-        @query.project = @project
-      end
-      @query
-    end
-  end
-
-  def build_query_from_params
-    if params[:fields] || params[:f]
-      @query.filters = {}
-      @query.add_filters(params[:fields] || params[:f], params[:operators] || params[:op], params[:values] || params[:v])
-    else
-      @query.available_filters.keys.each do |field|
-        @query.add_short_filter(field, params[field]) if params[field]
       end
     end
-    @query.group_by = params[:group_by] || (params[:query] && params[:query][:group_by])
-    @query.column_names = params[:c] || (params[:query] && params[:query][:column_names])
   end
 end

app/helpers/reports_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -33,6 +31,6 @@ module ReportsHelper
   
   def aggregate_link(data, criteria, *args)
     a = aggregate data, criteria
-    a > 0 ? link_to(h(a), *args) : '-'
+    a > 0 ? link_to(a, *args) : '-'
   end  
 end

app/helpers/repositories_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -17,128 +15,52 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-module RepositoriesHelper
+require 'iconv'
-  def format_revision(revision)
-    if revision.respond_to? :format_identifier
-      revision.format_identifier
-    else
-      revision.to_s
-    end
-  end
 
-  def truncate_at_line_break(text, length = 255)
+module RepositoriesHelper
-    if text
+  def format_revision(txt)
-      text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
+    txt.to_s[0,8]
-    end
   end
   
   def render_properties(properties)
     unless properties.nil? || properties.empty?
       content = ''
       properties.keys.sort.each do |property|
-        content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>".html_safe)
+        content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
       end
-      content_tag('ul', content.html_safe, :class => 'properties')
+      content_tag('ul', content, :class => 'properties')
     end
   end
   
-  def render_changeset_changes
+  def to_utf8(str)
-    changes = @changeset.filechanges.find(:all, :limit => 1000, :order => 'path').collect do |change|
+    return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
-      case change.action
+    @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
-      when 'A'
+    @encodings.each do |encoding|
-        # Detects moved/copied files
+      begin
-        if !change.from_path.blank?
+        return Iconv.conv('UTF-8', encoding, str)
-          change.action =
+      rescue Iconv::Failure
-             @changeset.filechanges.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
+        # do nothing here and try the next encoding
-        end
-        change
-      when 'D'
-        @changeset.filechanges.detect {|c| c.from_path == change.path} ? nil : change
-      else
-        change
-      end
-    end.compact
-
-    tree = { }
-    changes.each do |change|
-      p = tree
-      dirs = change.path.to_s.split('/').select {|d| !d.blank?}
-      path = ''
-      dirs.each do |dir|
-        path += '/' + dir
-        p[:s] ||= {}
-        p = p[:s]
-        p[path] ||= {}
-        p = p[path]
-      end
-      p[:c] = change
-    end
-    render_changes_tree(tree[:s])
-  end
-
-  def render_changes_tree(tree)
-    return '' if tree.nil?
-    output = ''
-    output << '<ul>'
-    tree.keys.sort.each do |file|
-      style = 'change'
-      text = File.basename(h(file))
-      if s = tree[file][:s]
-        style << ' folder'
-        path_param = to_path_param(@repository.relative_path(file))
-        text = link_to(h(text), :controller => 'repositories',
-                             :action => 'show',
-                             :id => @project,
-                             :repository_id => @repository.identifier_param,
-                             :path => path_param,
-                             :rev => @changeset.identifier)
-        output << "<li class='#{style}'>#{text}"
-        output << render_changes_tree(s)
-        output << "</li>"
-      elsif c = tree[file][:c]
-        style << " change-#{c.action}"
-        path_param = to_path_param(@repository.relative_path(c.path))
-        text = link_to(h(text), :controller => 'repositories',
-                             :action => 'entry',
-                             :id => @project,
-                             :repository_id => @repository.identifier_param,
-                             :path => path_param,
-                             :rev => @changeset.identifier) unless c.action == 'D'
-        text << " - #{h(c.revision)}" unless c.revision.blank?
-        text << ' ('.html_safe + link_to(l(:label_diff), :controller => 'repositories',
-                                       :action => 'diff',
-                                       :id => @project,
-                                       :repository_id => @repository.identifier_param,
-                                       :path => path_param,
-                                       :rev => @changeset.identifier) + ') '.html_safe if c.action == 'M'
-        text << ' '.html_safe + content_tag('span', h(c.from_path), :class => 'copied-from') unless c.from_path.blank?
-        output << "<li class='#{style}'>#{text}</li>"
       end
     end
-    output << '</ul>'
+    str
-    output.html_safe
   end
   
   def repository_field_tags(form, repository)    
     method = repository.class.name.demodulize.underscore + "_field_tags"
-    if repository.is_a?(Repository) &&
+    send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
-        respond_to?(method) && method != 'repository_field_tags'
-      send(method, form, repository)
-    end
   end
   
   def scm_select_tag(repository)
     scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
-    Redmine::Scm::Base.all.each do |scm|
+    REDMINE_SUPPORTED_SCM.each do |scm|
-    if Setting.enabled_scm.include?(scm) ||
+      scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
-          (repository && repository.class.name.demodulize == scm)
-        scm_options << ["Repository::#{scm}".constantize.scm_name, scm]
-      end
     end
+    
     select_tag('repository_scm', 
                options_for_select(scm_options, repository.class.name.demodulize),
                :disabled => (repository && !repository.new_record?),
-               :data => {:remote => true, :method => 'get'})
+               :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
+               )
   end
   
   def with_leading_slash(path)
@@ -150,148 +72,37 @@ module RepositoriesHelper
   end
 
   def subversion_field_tags(form, repository)
-      content_tag('p', form.text_field(:url, :size => 60, :required => true,
+      content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
-                       :disabled => !repository.safe_attribute?('url')) +
+                       '<br />(http://, https://, svn://, file:///)') +
-                       '<br />'.html_safe +
-                       '(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
       content_tag('p', form.text_field(:login, :size => 30)) +
-      content_tag('p', form.password_field(
+      content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
-                            :password, :size => 30, :name => 'ignore',
+                                           :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
-                            :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
+                                           :onfocus => "this.value=''; this.name='repository[password]';",
-                            :onfocus => "this.value=''; this.name='repository[password]';",
+                                           :onchange => "this.name='repository[password]';"))
-                            :onchange => "this.name='repository[password]';"))
   end
 
   def darcs_field_tags(form, repository)
-    content_tag('p', form.text_field(
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
-                     :url, :label => l(:field_path_to_repository),
-                     :size => 60, :required => true,
-                     :disabled => !repository.safe_attribute?('url'))) +
-    content_tag('p', form.select(
-                     :log_encoding, [nil] + Setting::ENCODINGS,
-                     :label => l(:field_commit_logs_encoding), :required => true))
   end
   
   def mercurial_field_tags(form, repository)
-    content_tag('p', form.text_field(
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
-                       :url, :label => l(:field_path_to_repository),
-                       :size => 60, :required => true,
-                       :disabled => !repository.safe_attribute?('url')
-                         ) +
-                     '<br />'.html_safe + l(:text_mercurial_repository_note)) +
-    content_tag('p', form.select(
-                        :path_encoding, [nil] + Setting::ENCODINGS,
-                        :label => l(:field_scm_path_encoding)
-                        ) +
-                     '<br />'.html_safe + l(:text_scm_path_encoding_note))
   end
 
   def git_field_tags(form, repository)
-    content_tag('p', form.text_field(
+      content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
-                       :url, :label => l(:field_path_to_repository),
-                       :size => 60, :required => true,
-                       :disabled => !repository.safe_attribute?('url')
-                         ) +
-                      '<br />'.html_safe +
-                      l(:text_git_repository_note)) +
-    content_tag('p', form.select(
-                        :path_encoding, [nil] + Setting::ENCODINGS,
-                        :label => l(:field_scm_path_encoding)
-                        ) +
-                     '<br />'.html_safe + l(:text_scm_path_encoding_note)) +
-    content_tag('p', form.check_box(
-                        :extra_report_last_commit,
-                        :label => l(:label_git_report_last_commit)
-                         ))
   end
 
   def cvs_field_tags(form, repository)
-    content_tag('p', form.text_field(
+      content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
-                     :root_url,
+      content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
-                     :label => l(:field_cvsroot),
-                     :size => 60, :required => true,
-                     :disabled => !repository.safe_attribute?('root_url'))) +
-    content_tag('p', form.text_field(
-                     :url,
-                     :label => l(:field_cvs_module),
-                     :size => 30, :required => true,
-                     :disabled => !repository.safe_attribute?('url'))) +
-    content_tag('p', form.select(
-                     :log_encoding, [nil] + Setting::ENCODINGS,
-                     :label => l(:field_commit_logs_encoding), :required => true)) +
-    content_tag('p', form.select(
-                        :path_encoding, [nil] + Setting::ENCODINGS,
-                        :label => l(:field_scm_path_encoding)
-                        ) +
-                     '<br />'.html_safe + l(:text_scm_path_encoding_note))
   end
 
   def bazaar_field_tags(form, repository)
-    content_tag('p', form.text_field(
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
-                     :url, :label => l(:field_path_to_repository),
-                     :size => 60, :required => true,
-                     :disabled => !repository.safe_attribute?('url'))) +
-    content_tag('p', form.select(
-                     :log_encoding, [nil] + Setting::ENCODINGS,
-                     :label => l(:field_commit_logs_encoding), :required => true))
   end
   
   def filesystem_field_tags(form, repository)
-    content_tag('p', form.text_field(
+    content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
-                     :url, :label => l(:field_root_directory),
-                     :size => 60, :required => true,
-                     :disabled => !repository.safe_attribute?('url'))) +
-    content_tag('p', form.select(
-                        :path_encoding, [nil] + Setting::ENCODINGS,
-                        :label => l(:field_scm_path_encoding)
-                        ) +
-                     '<br />'.html_safe + l(:text_scm_path_encoding_note))
-  end
-
-  def index_commits(commits, heads)
-    return nil if commits.nil? or commits.first.parents.nil?
-    refs_map = {}
-    heads.each do |head|
-      refs_map[head.scmid] ||= []
-      refs_map[head.scmid] << head
-    end
-    commits_by_scmid = {}
-    commits.reverse.each_with_index do |commit, commit_index|
-      commits_by_scmid[commit.scmid] = {
-        :parent_scmids => commit.parents.collect { |parent| parent.scmid },
-        :rdmid => commit_index,
-        :refs  => refs_map.include?(commit.scmid) ? refs_map[commit.scmid].join(" ") : nil,
-        :scmid => commit.scmid,
-        :href  => block_given? ? yield(commit.scmid) : commit.scmid
-      }
-    end
-    heads.sort! { |head1, head2| head1.to_s <=> head2.to_s }
-    space = nil  
-    heads.each do |head|
-      if commits_by_scmid.include? head.scmid
-        space = index_head((space || -1) + 1, head, commits_by_scmid)
-      end
-    end
-    # when no head matched anything use first commit
-    space ||= index_head(0, commits.first, commits_by_scmid)
-    return commits_by_scmid, space
-  end
-
-  def index_head(space, commit, commits_by_scmid)
-    stack = [[space, commits_by_scmid[commit.scmid]]]
-    max_space = space
-    until stack.empty?
-      space, commit = stack.pop
-      commit[:space] = space if commit[:space].nil?
-      space -= 1
-      commit[:parent_scmids].each_with_index do |parent_scmid, parent_index|
-        parent_commit = commits_by_scmid[parent_scmid]
-        if parent_commit and parent_commit[:space].nil?
-          stack.unshift [space += 1, parent_commit]
-        end
-      end
-      max_space = space if max_space < space
-    end
-    max_space
   end
 end

app/helpers/roles_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/search_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -29,27 +27,25 @@ module SearchHelper
         result << '...'
         break
       end
-      words = words.mb_chars
       if i.even?
-        result << h(words.length > 100 ? "#{words.slice(0..44)} ... #{words.slice(-45..-1)}" : words)
+        result << h(words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words)
       else
         t = (tokens.index(words.downcase) || 0) % 4
         result << content_tag('span', h(words), :class => "highlight token-#{t}")
       end
     end
-    result.html_safe
+    result
   end
   
   def type_label(t)
-    l("label_#{t.singularize}_plural", :default => t.to_s.humanize)
+    l("label_#{t.singularize}_plural")
   end
   
   def project_select_tag
     options = [[l(:label_project_all), 'all']]
     options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty?
-    options << [l(:label_and_its_subprojects, @project.name), 'subprojects'] unless @project.nil? || @project.descendants.active.empty?
+    options << [l(:label_and_its_subprojects, @project.name), 'subprojects'] unless @project.nil? || @project.active_children.empty?
     options << [@project.name, ''] unless @project.nil?
-    label_tag("scope", l(:description_project_scope), :class => "hidden-for-sighted") +
     select_tag('scope', options_for_select(options, params[:scope].to_s)) if options.size > 1
   end
   
@@ -60,11 +56,8 @@ module SearchHelper
       c = results_by_type[t]
       next if c == 0
       text = "#{type_label(t)} (#{c})"
-      links << link_to(h(text), :q => params[:q], :titles_only => params[:titles_only],
+      links << link_to(text, :q => params[:q], :titles_only => params[:title_only], :all_words => params[:all_words], :scope => params[:scope], t => 1)
-                       :all_words => params[:all_words], :scope => params[:scope], t => 1)
     end
-    ('<ul>'.html_safe +
+    ('<ul>' + links.map {|link| content_tag('li', link)}.join(' ') + '</ul>') unless links.empty?
-        links.map {|link| content_tag('li', link)}.join(' ').html_safe + 
-        '</ul>'.html_safe) unless links.empty?
   end
 end

app/helpers/settings_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -20,87 +18,11 @@
 module SettingsHelper
   def administration_settings_tabs
     tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
-            {:name => 'display', :partial => 'settings/display', :label => :label_display},
             {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
-            {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
             {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
-            {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification},
+            {:name => 'notifications', :partial => 'settings/notifications', :label => l(:field_mail_notification)},
-            {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails},
+            {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => l(:label_incoming_emails)},
             {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
             ]
   end
-
-  def setting_select(setting, choices, options={})
-    if blank_text = options.delete(:blank)
-      choices = [[blank_text.is_a?(Symbol) ? l(blank_text) : blank_text, '']] + choices
-    end
-    setting_label(setting, options).html_safe +
-      select_tag("settings[#{setting}]",
-                 options_for_select(choices, Setting.send(setting).to_s),
-                 options).html_safe
-  end
-
-  def setting_multiselect(setting, choices, options={})
-    setting_values = Setting.send(setting)
-    setting_values = [] unless setting_values.is_a?(Array)
-
-    content_tag("label", l(options[:label] || "setting_#{setting}")) +
-      hidden_field_tag("settings[#{setting}][]", '').html_safe +
-      choices.collect do |choice|
-        text, value = (choice.is_a?(Array) ? choice : [choice, choice])
-        content_tag(
-          'label',
-          check_box_tag(
-             "settings[#{setting}][]",
-             value,
-             Setting.send(setting).include?(value),
-             :id => nil
-           ) + text.to_s,
-          :class => (options[:inline] ? 'inline' : 'block')
-         )
-      end.join.html_safe
-  end
-
-  def setting_text_field(setting, options={})
-    setting_label(setting, options).html_safe +
-      text_field_tag("settings[#{setting}]", Setting.send(setting), options).html_safe
-  end
-
-  def setting_text_area(setting, options={})
-    setting_label(setting, options).html_safe +
-      text_area_tag("settings[#{setting}]", Setting.send(setting), options).html_safe
-  end
-
-  def setting_check_box(setting, options={})
-    setting_label(setting, options).html_safe +
-      hidden_field_tag("settings[#{setting}]", 0, :id => nil).html_safe +
-        check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options).html_safe
-  end
-
-  def setting_label(setting, options={})
-    label = options.delete(:label)
-    label != false ? label_tag("settings_#{setting}", l(label || "setting_#{setting}")).html_safe : ''
-  end
-
-  # Renders a notification field for a Redmine::Notifiable option
-  def notification_field(notifiable)
-    return content_tag(:label,
-                       check_box_tag('settings[notified_events][]',
-                                     notifiable.name,
-                                     Setting.notified_events.include?(notifiable.name), :id => nil).html_safe +
-                         l_or_humanize(notifiable.name, :prefix => 'label_').html_safe,
-                       :class => notifiable.parent.present? ? "parent" : '').html_safe
-  end
-
-  def cross_project_subtasks_options
-    options = [
-      [:label_disabled, ''],
-      [:label_cross_project_system, 'system'],
-      [:label_cross_project_tree, 'tree'],
-      [:label_cross_project_hierarchy, 'hierarchy'],
-      [:label_cross_project_descendants, 'descendants']
-    ]
-
-    options.map {|label, value| [l(label), value.to_s]}
-  end
 end

app/helpers/sort_helper.rb

@@ -1,14 +1,11 @@
-# encoding: utf-8
-#
 # Helpers to sort tables using clickable column headers.
 #
 # Author:  Stuart Rackham <srackham@methods.co.nz>, March 2005.
-#          Jean-Philippe Lang, 2009
 # License: This source code is released under the MIT license.
 #
 # - Consecutive clicks toggle the column's sort order.
 # - Sort state is maintained by a session hash entry.
-# - CSS classes identify sort column and state.
+# - Icon image identifies sort column and state.
 # - Typically used in conjunction with the Pagination module.
 #
 # Example code snippets:
@@ -20,7 +17,7 @@
 # 
 #   def list
 #     sort_init 'last_name'
-#     sort_update %w(first_name last_name)
+#     sort_update
 #     @items = Contact.find_all nil, sort_clause
 #   end
 # 
@@ -31,7 +28,7 @@
 # 
 #   def list
 #     sort_init 'last_name'
-#     sort_update %w(first_name last_name)
+#     sort_update
 #     @contact_pages, @items = paginate :contacts,
 #       :order_by => sort_clause,
 #       :per_page => 10
@@ -48,175 +45,77 @@
 #     </tr>
 #   </thead>
 #
-# - Introduces instance variables: @sort_default, @sort_criteria
+# - The ascending and descending sort icon images are sort_asc.png and
-# - Introduces param :sort
+#   sort_desc.png and reside in the application's images directory.
+# - Introduces instance variables: @sort_name, @sort_default.
+# - Introduces params :sort_key and :sort_order.
 #
-
 module SortHelper
-  class SortCriteria
 
-    def initialize
+  # Initializes the default sort column (default_key) and sort order
-      @criteria = []
+  # (default_order).
-    end
-
-    def available_criteria=(criteria)
-      unless criteria.is_a?(Hash)
-        criteria = criteria.inject({}) {|h,k| h[k] = k; h}
-      end
-      @available_criteria = criteria
-    end
-
-    def from_param(param)
-      @criteria = param.to_s.split(',').collect {|s| s.split(':')[0..1]}
-      normalize!
-    end
-
-    def criteria=(arg)
-      @criteria = arg
-      normalize!
-    end
-
-    def to_param
-      @criteria.collect {|k,o| k + (o ? '' : ':desc')}.join(',')
-    end
-
-    def to_sql
-      sql = @criteria.collect do |k,o|
-        if s = @available_criteria[k]
-          (o ? s.to_a : s.to_a.collect {|c| append_desc(c)}).join(', ')
-        end
-      end.compact.join(', ')
-      sql.blank? ? nil : sql
-    end
-
-    def to_a
-      @criteria.dup
-    end
-
-    def add!(key, asc)
-      @criteria.delete_if {|k,o| k == key}
-      @criteria = [[key, asc]] + @criteria
-      normalize!
-    end
-
-    def add(*args)
-      r = self.class.new.from_param(to_param)
-      r.add!(*args)
-      r
-    end
-
-    def first_key
-      @criteria.first && @criteria.first.first
-    end
-
-    def first_asc?
-      @criteria.first && @criteria.first.last
-    end
-
-    def empty?
-      @criteria.empty?
-    end
-
-    private
-
-    def normalize!
-      @criteria ||= []
-      @criteria = @criteria.collect {|s| s = s.to_a; [s.first, (s.last == false || s.last == 'desc') ? false : true]}
-      @criteria = @criteria.select {|k,o| @available_criteria.has_key?(k)} if @available_criteria
-      @criteria.slice!(3)
-      self
-    end
-
-    # Appends DESC to the sort criterion unless it has a fixed order
-    def append_desc(criterion)
-      if criterion =~ / (asc|desc)$/i
-        criterion
-      else
-        "#{criterion} DESC"
-      end
-    end
-  end
-
-  def sort_name
-    controller_name + '_' + action_name + '_sort'
-  end
-
-  # Initializes the default sort.
-  # Examples:
   #
-  #   sort_init 'name'
+  # - default_key is a column attribute name.
-  #   sort_init 'id', 'desc'
+  # - default_order is 'asc' or 'desc'.
-  #   sort_init ['name', ['id', 'desc']]
+  # - name is the name of the session hash entry that stores the sort state,
-  #   sort_init [['name', 'desc'], ['id', 'desc']]
+  #   defaults to '<controller_name>_sort'.
   #
-  def sort_init(*args)
+  def sort_init(default_key, default_order='asc', name=nil)
-    case args.size
+    @sort_name = name || params[:controller] + params[:action] + '_sort'
-    when 1
+    @sort_default = {:key => default_key, :order => default_order}
-      @sort_default = args.first.is_a?(Array) ? args.first : [[args.first]]
-    when 2
-      @sort_default = [[args.first, args.last]]
-    else
-      raise ArgumentError
-    end
   end
 
   # Updates the sort state. Call this in the controller prior to calling
   # sort_clause.
-  # - criteria can be either an array or a hash of allowed keys
   #
-  def sort_update(criteria, sort_name=nil)
+  def sort_update()
-    sort_name ||= self.sort_name
+    if params[:sort_key]
-    @sort_criteria = SortCriteria.new
+      sort = {:key => params[:sort_key], :order => params[:sort_order]}
-    @sort_criteria.available_criteria = criteria
+    elsif session[@sort_name]
-    @sort_criteria.from_param(params[:sort] || session[sort_name])
+      sort = session[@sort_name]   # Previous sort.
-    @sort_criteria.criteria = @sort_default if @sort_criteria.empty?
+    else
-    session[sort_name] = @sort_criteria.to_param
+      sort = @sort_default
-  end
+    end
-
+    session[@sort_name] = sort
-  # Clears the sort criteria session data
-  #
-  def sort_clear
-    session[sort_name] = nil
   end
 
   # Returns an SQL sort clause corresponding to the current sort state.
   # Use this to sort the controller's table items collection.
   #
   def sort_clause()
-    @sort_criteria.to_sql
+    session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
-  end
-
-  def sort_criteria
-    @sort_criteria
   end
 
   # Returns a link which sorts by the named column.
   #
   # - column is the name of an attribute in the sorted record collection.
-  # - the optional caption explicitly specifies the displayed link text.
+  # - The optional caption explicitly specifies the displayed link text.
-  # - 2 CSS classes reflect the state of the link: sort and asc or desc
+  # - A sort icon image is positioned to the right of the sort link.
   #
   def sort_link(column, caption, default_order)
-    css, order = nil, default_order
+    key, order = session[@sort_name][:key], session[@sort_name][:order]
-
+    if key == column
-    if column.to_s == @sort_criteria.first_key
+      if order.downcase == 'asc'
-      if @sort_criteria.first_asc?
+        icon = 'sort_asc.png'
-        css = 'sort asc'
         order = 'desc'
       else
-        css = 'sort desc'
+        icon = 'sort_desc.png'
         order = 'asc'
       end
+    else
+      icon = nil
+      order = default_order
     end
-    caption = column.to_s.humanize unless caption
+    caption = titleize(Inflector::humanize(column)) unless caption
     
-    sort_options = { :sort => @sort_criteria.add(column.to_s, order).to_param }
+    sort_options = { :sort_key => column, :sort_order => order }
-    url_options = params.merge(sort_options)
+    # don't reuse params if filters are present
+    url_options = params.has_key?(:set_filter) ? sort_options : params.merge(sort_options)
     
-     # Add project_id to url_options
+    link_to_remote(caption,
-    url_options = url_options.merge(:project_id => params[:project_id]) if params.has_key?(:project_id)
+                  {:update => "content", :url => url_options},
-
+                  {:href => url_for(url_options)}) +
-    link_to_content_update(h(caption), url_options, :class => css)
+    (icon ? nbsp(2) + image_tag(icon) : '')
   end
 
   # Returns a table header <th> tag with a sort link for the named column
@@ -232,11 +131,30 @@ module SortHelper
   #
   #   <%= sort_header_tag('id', :title => 'Sort by contact ID', :width => 40) %>
   #
+  # Renders:
+  #
+  #   <th title="Sort by contact ID" width="40">
+  #     <a href="/contact/list?sort_order=desc&amp;sort_key=id">Id</a>
+  #     &nbsp;&nbsp;<img alt="Sort_asc" src="/images/sort_asc.png" />
+  #   </th>
+  #
   def sort_header_tag(column, options = {})
-    caption = options.delete(:caption) || column.to_s.humanize
+    caption = options.delete(:caption) || titleize(Inflector::humanize(column))
     default_order = options.delete(:default_order) || 'asc'
-    options[:title] = l(:label_sort_by, "\"#{caption}\"") unless options[:title]
+    options[:title]= l(:label_sort_by, "\"#{caption}\"") unless options[:title]
     content_tag('th', sort_link(column, caption, default_order), options)
   end
-end
 
+  private
+
+    # Return n non-breaking spaces.
+    def nbsp(n)
+      '&nbsp;' * n
+    end
+
+    # Return capitalized title.
+    def titleize(title)
+      title.split.map {|w| w.capitalize }.join(' ')
+    end
+
+end

app/helpers/timelog_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,49 +16,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module TimelogHelper
-  include ApplicationHelper
+  def activity_collection_for_select_options
-
+    activities = Enumeration::get_values('ACTI')
-  def render_timelog_breadcrumb
-    links = []
-    links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
-    links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
-    if @issue
-      if @issue.visible?
-        links << link_to_issue(@issue, :subject => false)
-      else
-        links << "##{@issue.id}"
-      end
-    end
-    breadcrumb links
-  end
-
-  # Returns a collection of activities for a select field.  time_entry
-  # is optional and will be used to check if the selected TimeEntryActivity
-  # is active.
-  def activity_collection_for_select_options(time_entry=nil, project=nil)
-    project ||= @project
-    if project.nil?
-      activities = TimeEntryActivity.shared.active
-    else
-      activities = project.activities
-    end
-
     collection = []
-    if time_entry && time_entry.activity && !time_entry.activity.active?
+    collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
-      collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ]
-    else
-      collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
-    end
     activities.each { |a| collection << [a.name, a.id] }
     collection
   end
   
   def select_hours(data, criteria, value)
-  	if value.to_s.empty?
+    data.select {|row| row[criteria] == value}
-  		data.select {|row| row[criteria].blank? }
-    else
-    	data.select {|row| row[criteria].to_s == value.to_s}
-    end
   end
   
   def sum_hours(data)
@@ -77,7 +42,6 @@ module TimelogHelper
                         [l(:label_yesterday), 'yesterday'],
                         [l(:label_this_week), 'current_week'],
                         [l(:label_last_week), 'last_week'],
-                        [l(:label_last_n_weeks, 2), 'last_2_weeks'],
                         [l(:label_last_n_days, 7), '7_days'],
                         [l(:label_this_month), 'current_month'],
                         [l(:label_last_month), 'last_month'],
@@ -87,9 +51,11 @@ module TimelogHelper
   end
   
   def entries_to_csv(entries)
+    ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
     decimal_separator = l(:general_csv_decimal_separator)
     custom_fields = TimeEntryCustomField.find(:all)
-    export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
+    export = StringIO.new
+    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
       # csv header fields
       headers = [l(:field_spent_on),
                  l(:field_user),
@@ -104,12 +70,10 @@ module TimelogHelper
       # Export custom fields
       headers += custom_fields.collect(&:name)
       
-      csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
+      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
-                                     c.to_s,
-                                     l(:general_csv_encoding) )  }
       # csv lines
       entries.each do |entry|
-        fields = [format_date(entry.spent_on),
+        fields = [l_date(entry.spent_on),
                   entry.user,
                   entry.activity,
                   entry.project,
@@ -119,79 +83,68 @@ module TimelogHelper
                   entry.hours.to_s.gsub('.', decimal_separator),
                   entry.comments
                   ]
-        fields += custom_fields.collect {|f| show_value(entry.custom_field_values.detect {|v| v.custom_field_id == f.id}) }
+        fields += custom_fields.collect {|f| show_value(entry.custom_value_for(f)) }
                   
-        csv << fields.collect {|c| Redmine::CodesetUtil.from_utf8(
+        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
-                                     c.to_s,
-                                     l(:general_csv_encoding) )  }
       end
     end
+    export.rewind
     export
   end
   
-  def format_criteria_value(criteria_options, value)
+  def format_criteria_value(criteria, value)
-    if value.blank?
+    value.blank? ? l(:label_none) : ((k = @available_criterias[criteria][:klass]) ? k.find_by_id(value.to_i) : format_value(value, @available_criterias[criteria][:format]))
-      "[#{l(:label_none)}]"
-    elsif k = criteria_options[:klass]
-      obj = k.find_by_id(value.to_i)
-      if obj.is_a?(Issue)
-        obj.visible? ? "#{obj.tracker} ##{obj.id}: #{obj.subject}" : "##{obj.id}"
-      else
-        obj
-      end
-    else
-      format_value(value, criteria_options[:format])
-    end
   end
   
-  def report_to_csv(report)
+  def report_to_csv(criterias, periods, hours)
-    decimal_separator = l(:general_csv_decimal_separator)
+    export = StringIO.new
-    export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
+    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
       # Column headers
-      headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
+      headers = criterias.collect {|criteria| l(@available_criterias[criteria][:label]) }
-      headers += report.periods
+      headers += periods
       headers << l(:label_total)
-      csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
+      csv << headers.collect {|c| to_utf8(c) }
-                                    c.to_s,
-                                    l(:general_csv_encoding) ) }
       # Content
-      report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
+      report_criteria_to_csv(csv, criterias, periods, hours)
       # Total row
-      str_total = Redmine::CodesetUtil.from_utf8(l(:label_total), l(:general_csv_encoding))
+      row = [ l(:label_total) ] + [''] * (criterias.size - 1)
-      row = [ str_total ] + [''] * (report.criteria.size - 1)
-      total = 0
-      report.periods.each do |period|
-        sum = sum_hours(select_hours(report.hours, report.columns, period.to_s))
-        total += sum
-        row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '')
-      end
-      row << ("%.2f" % total).gsub('.',decimal_separator)
-      csv << row
-    end
-    export
-  end
-
-  def report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours, level=0)
-    decimal_separator = l(:general_csv_decimal_separator)
-    hours.collect {|h| h[criteria[level]].to_s}.uniq.each do |value|
-      hours_for_value = select_hours(hours, criteria[level], value)
-      next if hours_for_value.empty?
-      row = [''] * level
-      row << Redmine::CodesetUtil.from_utf8(
-                        format_criteria_value(available_criteria[criteria[level]], value).to_s,
-                        l(:general_csv_encoding) )
-      row += [''] * (criteria.length - level - 1)
       total = 0
       periods.each do |period|
-        sum = sum_hours(select_hours(hours_for_value, columns, period.to_s))
+        sum = sum_hours(select_hours(hours, @columns, period.to_s))
         total += sum
-        row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '')
+        row << (sum > 0 ? "%.2f" % sum : '')
       end
-      row << ("%.2f" % total).gsub('.',decimal_separator)
+      row << "%.2f" %total
       csv << row
-      if criteria.length > level + 1
+    end
-        report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours_for_value, level + 1)
+    export.rewind
+    export
+  end
+  
+  def report_criteria_to_csv(csv, criterias, periods, hours, level=0)
+    hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value|
+      hours_for_value = select_hours(hours, criterias[level], value)
+      next if hours_for_value.empty?
+      row = [''] * level
+      row << to_utf8(format_criteria_value(criterias[level], value))
+      row += [''] * (criterias.length - level - 1)
+      total = 0
+      periods.each do |period|
+        sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s))
+        total += sum
+        row << (sum > 0 ? "%.2f" % sum : '')
+      end
+      row << "%.2f" %total
+      csv << row
+      
+      if criterias.length > level + 1
+        report_criteria_to_csv(csv, criterias, periods, hours_for_value, level + 1)
       end
     end
   end
+  
+  def to_utf8(s)
+    @ic ||= Iconv.new(l(:general_csv_encoding), 'UTF-8')
+    begin; @ic.iconv(s.to_s); rescue; s.to_s; end
+  end
 end

app/helpers/trackers_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/users_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,27 +16,36 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module UsersHelper
-  def users_status_options_for_select(selected)
+  def status_options_for_select(selected)
-    user_count_by_status = User.count(:group => 'status').to_hash
     options_for_select([[l(:label_all), ''], 
-                        ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", '1'],
+                        [l(:status_active), 1],
-                        ["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", '2'],
+                        [l(:status_registered), 2],
-                        ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s)
+                        [l(:status_locked), 3]], selected)
   end
   
-  def user_mail_notification_options(user)
+  # Options for the new membership projects combo-box
-    user.valid_notification_options.collect {|o| [l(o.last), o.first]}
+  def projects_options_for_select(projects)
+    options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
+    projects_by_root = projects.group_by(&:root)
+    projects_by_root.keys.sort.each do |root|
+      options << content_tag('option', h(root.name), :value => root.id, :disabled => (!projects.include?(root)))
+      projects_by_root[root].sort.each do |project|
+        next if project == root
+        options << content_tag('option', '&#187; ' + h(project.name), :value => project.id)
+      end
+    end
+    options
   end
   
   def change_status_link(user)
-    url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil}
+    url = {:action => 'edit', :id => user, :page => params[:page], :status => params[:status]}
     
     if user.locked?
-      link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'
+      link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
     elsif user.registered?
-      link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'
+      link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
     elsif user != User.current
-      link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :put, :class => 'icon icon-lock'
+      link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
     end
   end
   
@@ -46,9 +53,5 @@ module UsersHelper
     tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
             {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
             ]
-    if Group.all.any?
-      tabs.insert 1, {:name => 'groups', :partial => 'users/groups', :label => :label_group_plural}
-    end
-    tabs
   end
 end

app/helpers/versions_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -19,18 +17,11 @@
 
 module VersionsHelper
 
-  def version_anchor(version)
+  STATUS_BY_CRITERIAS = %w(category tracker priority author assigned_to)
-    if @project == version.project
-      anchor version.name
-    else
-      anchor "#{version.project.try(:identifier)}-#{version.name}"
-    end
-  end
-
-  STATUS_BY_CRITERIAS = %w(tracker status priority author assigned_to category)
   
   def render_issue_status_by(version, criteria)
-    criteria = 'tracker' unless STATUS_BY_CRITERIAS.include?(criteria)
+    criteria ||= 'category'
+    raise 'Unknown criteria' unless STATUS_BY_CRITERIAS.include?(criteria)
     
     h = Hash.new {|k,v| k[v] = [0, 0]}
     begin
@@ -44,8 +35,7 @@ module VersionsHelper
     rescue ActiveRecord::RecordNotFound
     # When grouping by an association, Rails throws this exception if there's no result (bug)
     end
-    # Sort with nil keys in last position
+    counts = h.keys.compact.sort.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
-    counts = h.keys.sort {|a,b| a.nil? ? 1 : (b.nil? ? -1 : a <=> b)}.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
     max = counts.collect {|c| c[:total]}.max
     
     render :partial => 'issue_counts', :locals => {:version => version, :criteria => criteria, :counts => counts, :max => max}

app/helpers/watchers_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -18,58 +16,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module WatchersHelper
-
+  def watcher_tag(object, user)
-  def watcher_tag(object, user, options={})
+    content_tag("span", watcher_link(object, user), :id => 'watcher')
-    content_tag("span", watcher_link(object, user), :class => watcher_css(object))
   end
   
   def watcher_link(object, user)
     return '' unless user && user.logged? && object.respond_to?('watched_by?')
     watched = object.watched_by?(user)
     url = {:controller => 'watchers',
-           :action => (watched ? 'unwatch' : 'watch'),
+           :action => (watched ? 'remove' : 'add'),
            :object_type => object.class.to_s.underscore,
            :object_id => object.id}           
-    link_to((watched ? l(:button_unwatch) : l(:button_watch)), url,
+    link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
-            :remote => true, :method => 'post', :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
+                   {:url => url},
+                   :href => url_for(url),
+                   :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
   
   end
-
-  # Returns the css class used to identify watch links for a given +object+
-  def watcher_css(object)
-    "#{object.class.to_s.underscore}-#{object.id}-watcher"
-  end
-
-  # Returns a comma separated list of users watching the given object
-  def watchers_list(object)
-    remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project)
-    content = ''.html_safe
-    lis = object.watcher_users.collect do |user|
-      s = ''.html_safe
-      s << avatar(user, :size => "16").to_s
-      s << link_to_user(user, :class => 'user')
-      if remove_allowed
-        url = {:controller => 'watchers',
-               :action => 'destroy',
-               :object_type => object.class.to_s.underscore,
-               :object_id => object.id,
-               :user_id => user}
-        s << ' '
-        s << link_to(image_tag('delete.png'), url,
-                     :remote => true, :method => 'post', :style => "vertical-align: middle", :class => "delete")
-      end
-      content << content_tag('li', s)
-    end
-    content.present? ? content_tag('ul', content) : content
-  end
-
-  def watchers_checkboxes(object, users, checked=nil)
-    users.map do |user|
-      c = checked.nil? ? object.watched_by?(user) : checked
-      tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil
-      content_tag 'label', "#{tag} #{h(user)}".html_safe,
-                  :id => "issue_watcher_user_ids_#{user.id}",
-                  :class => "floating"
-    end.join.html_safe
-  end
 end

app/helpers/welcome_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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

app/helpers/wiki_helper.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
+# redMine - project management software
-#
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-# Redmine - project management software
-# Copyright (C) 2006-2012  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
@@ -19,25 +17,56 @@
 
 module WikiHelper
 
-  def wiki_page_options_for_select(pages, selected = nil, parent = nil, level = 0)
+  def render_page_hierarchy(pages, node=nil)
-    pages = pages.group_by(&:parent) unless pages.is_a?(Hash)
+    content = ''
-    s = ''.html_safe
+    if pages[node]
-    if pages.has_key?(parent)
+      content << "<ul class=\"pages-hierarchy\">\n"
-      pages[parent].each do |page|
+      pages[node].each do |page|
-        attrs = "value='#{page.id}'"
+        content << "<li>"
-        attrs << " selected='selected'" if selected == page
+        content << link_to(h(page.pretty_title), {:action => 'index', :page => page.title},
-        indent = (level > 0) ? ('&nbsp;' * level * 2 + '&#187; ') : ''
+                           :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
+        content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
+        content << "</li>\n"
+      end
+      content << "</ul>\n"
+    end
+    content
+  end
   
-        s << content_tag('option', (indent + h(page.pretty_title)).html_safe, :value => page.id.to_s, :selected => selected == page) +
+  def html_diff(wdiff)
-               wiki_page_options_for_select(pages, selected, page, level + 1)
+    words = wdiff.words.collect{|word| h(word)}
+    words_add = 0
+    words_del = 0
+    dels = 0
+    del_off = 0
+    wdiff.diff.diffs.each do |diff|
+      add_at = nil
+      add_to = nil
+      del_at = nil
+      deleted = ""	    
+      diff.each do |change|
+        pos = change[1]
+        if change[0] == "+"
+          add_at = pos + dels unless add_at
+          add_to = pos + dels
+          words_add += 1
+        else
+          del_at = pos unless del_at
+          deleted << ' ' + change[2]
+          words_del	 += 1
+        end
+      end
+      if add_at
+        words[add_at] = '<span class="diff_in">' + words[add_at]
+        words[add_to] = words[add_to] + '</span>'
+      end
+      if del_at
+        words.insert del_at - del_off + dels + words_add, '<span class="diff_out">' + deleted + '</span>'
+        dels += 1
+        del_off += words_del
+        words_del = 0
       end
     end
-    s
+    simple_format_without_paragraph(words.join(' '))
-  end
-
-  def wiki_page_breadcrumb(page)
-    breadcrumb(page.ancestors.reverse.collect {|parent|
-      link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project, :version => nil})
-    })
   end
 end

app/helpers/workflows_helper.rb

@@ -1,32 +0,0 @@
-# encoding: utf-8
-#
-# Redmine - project management software
-# Copyright (C) 2006-2012  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.
-
-module WorkflowsHelper
-  def field_required?(field)
-    field.is_a?(CustomField) ? field.is_required? : %w(project_id tracker_id subject priority_id is_private).include?(field)
-  end
-
-  def field_permission_tag(permissions, status, field)
-    name = field.is_a?(CustomField) ? field.id.to_s : field
-    options = [["", ""], [l(:label_readonly), "readonly"]]
-    options << [l(:label_required), "required"] unless field_required?(field)
-
-    select_tag("permissions[#{name}][#{status.id}]", options_for_select(options, permissions[status.id][name]))
-  end
-end

app/models/attachment.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -21,66 +21,39 @@ class Attachment < ActiveRecord::Base
   belongs_to :container, :polymorphic => true
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   
-  validates_presence_of :filename, :author
+  validates_presence_of :container, :filename, :author
   validates_length_of :filename, :maximum => 255
   validates_length_of :disk_filename, :maximum => 255
-  validates_length_of :description, :maximum => 255
-  validate :validate_max_file_size
 
   acts_as_event :title => :filename,
                 :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
 
   acts_as_activity_provider :type => 'files',
                             :permission => :view_files,
-                            :author_key => :author_id,
                             :find_options => {:select => "#{Attachment.table_name}.*", 
                                               :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
-                                                        "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_id = #{Project.table_name}.id )"}
+                                                        "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id"}
   
   acts_as_activity_provider :type => 'documents',
                             :permission => :view_documents,
-                            :author_key => :author_id,
                             :find_options => {:select => "#{Attachment.table_name}.*", 
                                               :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
                                                         "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
 
   cattr_accessor :storage_path
-  @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
+  @@storage_path = "#{RAILS_ROOT}/files"
   
-  cattr_accessor :thumbnails_storage_path
+  def validate
-  @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
+    errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
-
-  before_save :files_to_final_location
-  after_destroy :delete_from_disk
-
-  # Returns an unsaved copy of the attachment
-  def copy(attributes=nil)
-    copy = self.class.new
-    copy.attributes = self.attributes.dup.except("id", "downloads")
-    copy.attributes = attributes if attributes
-    copy
-  end
-
-  def validate_max_file_size
-    if @temp_file && self.filesize > Setting.attachment_max_size.to_i.kilobytes
-      errors.add(:base, l(:error_attachment_too_big, :max_size => Setting.attachment_max_size.to_i.kilobytes))
-    end
   end
 
   def file=(incoming_file)
     unless incoming_file.nil?
       @temp_file = incoming_file
       if @temp_file.size > 0
-        if @temp_file.respond_to?(:original_filename)
+        self.filename = sanitize_filename(@temp_file.original_filename)
-          self.filename = @temp_file.original_filename
+        self.disk_filename = Attachment.disk_filename(filename)
-          self.filename.force_encoding("UTF-8") if filename.respond_to?(:force_encoding)
+        self.content_type = @temp_file.content_type.to_s.chomp
-        end
-        if @temp_file.respond_to?(:content_type)
-          self.content_type = @temp_file.content_type.to_s.chomp
-        end
-        if content_type.blank? && filename.present?
-          self.content_type = Redmine::MimeType.of(filename)
-        end
         self.filesize = @temp_file.size
       end
     end
@@ -90,59 +63,29 @@ class Attachment < ActiveRecord::Base
     nil
   end
 
-  def filename=(arg)
+  # Copy temp file to its final location
-    write_attribute :filename, sanitize_filename(arg.to_s)
+  def before_save
-    if new_record? && disk_filename.blank?
-      self.disk_filename = Attachment.disk_filename(filename)
-    end
-    filename
-  end
-
-  # Copies the temporary file to its final location
-  # and computes its MD5 hash
-  def files_to_final_location
     if @temp_file && (@temp_file.size > 0)
-      logger.info("Saving attachment '#{self.diskfile}' (#{@temp_file.size} bytes)")
+      logger.debug("saving '#{self.diskfile}'")
-      md5 = Digest::MD5.new
       File.open(diskfile, "wb") do |f| 
-        if @temp_file.respond_to?(:read)
+        f.write(@temp_file.read)
-          buffer = ""
-          while (buffer = @temp_file.read(8192))
-            f.write(buffer)
-            md5.update(buffer)
-          end
-        else
-          f.write(@temp_file)
-          md5.update(@temp_file)
-        end
       end
-      self.digest = md5.hexdigest
+      self.digest = Digest::MD5.hexdigest(File.read(diskfile))
     end
-    @temp_file = nil
     # Don't save the content type if it's longer than the authorized length
     if self.content_type && self.content_type.length > 255
       self.content_type = nil
     end
   end
 
-  # Deletes the file from the file system if it's not referenced by other attachments
+  # Deletes file on the disk
-  def delete_from_disk
+  def after_destroy
-    if Attachment.where("disk_filename = ? AND id <> ?", disk_filename, id).empty?
+    File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
-      delete_from_disk!
-    end
   end
 
   # Returns file's location on disk
   def diskfile
-    File.join(self.class.storage_path, disk_filename.to_s)
+    "#{@@storage_path}/#{self.disk_filename}"
-  end
-
-  def title
-    title = filename.to_s
-    if description.present?
-      title << " (#{description})"
-    end
-    title
   end
   
   def increment_download
@@ -150,55 +93,11 @@ class Attachment < ActiveRecord::Base
   end
 
   def project
-    container.try(:project)
+    container.project
-  end
-
-  def visible?(user=User.current)
-    container && container.attachments_visible?(user)
-  end
-
-  def deletable?(user=User.current)
-    container && container.attachments_deletable?(user)
   end
   
   def image?
-    !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i)
+    self.filename =~ /\.(jpe?g|gif|png)$/i
-  end
-
-  def thumbnailable?
-    image?
-  end
-
-  # Returns the full path the attachment thumbnail, or nil
-  # if the thumbnail cannot be generated.
-  def thumbnail(options={})
-    if thumbnailable? && readable?
-      size = options[:size].to_i
-      if size > 0
-        # Limit the number of thumbnails per image
-        size = (size / 50) * 50
-        # Maximum thumbnail size
-        size = 800 if size > 800
-      else
-        size = Setting.thumbnails_size.to_i
-      end
-      size = 100 unless size > 0
-      target = File.join(self.class.thumbnails_storage_path, "#{id}_#{digest}_#{size}.thumb")
-
-      begin
-        Redmine::Thumbnail.generate(self.diskfile, target, size)
-      rescue => e
-        logger.error "An error occured while generating thumbnail for #{disk_filename} to #{target}\nException was: #{e.message}" if logger
-        return nil
-      end
-    end
-  end
-
-  # Deletes all thumbnails
-  def self.clear_thumbnails
-    Dir.glob(File.join(thumbnails_storage_path, "*.thumb")).each do |file|
-      File.delete file
-    end
   end
   
   def is_text?
@@ -209,79 +108,27 @@ class Attachment < ActiveRecord::Base
     self.filename =~ /\.(patch|diff)$/i
   end
   
-  # Returns true if the file is readable
+private
-  def readable?
-    File.readable?(diskfile)
-  end
-
-  # Returns the attachment token
-  def token
-    "#{id}.#{digest}"
-  end
-
-  # Finds an attachment that matches the given token and that has no container
-  def self.find_by_token(token)
-    if token.to_s =~ /^(\d+)\.([0-9a-f]+)$/
-      attachment_id, attachment_digest = $1, $2
-      attachment = Attachment.where(:id => attachment_id, :digest => attachment_digest).first
-      if attachment && attachment.container.nil?
-        attachment
-      end
-    end
-  end
-
-  # Bulk attaches a set of files to an object
-  #
-  # Returns a Hash of the results:
-  # :files => array of the attached files
-  # :unsaved => array of the files that could not be attached
-  def self.attach_files(obj, attachments)
-    result = obj.save_attachments(attachments, User.current)
-    obj.attach_saved_attachments
-    result
-  end
-
-  def self.latest_attach(attachments, filename)
-    attachments.sort_by(&:created_on).reverse.detect {
-      |att| att.filename.downcase == filename.downcase
-     }
-  end
-
-  def self.prune(age=1.day)
-    Attachment.where("created_on < ? AND (container_type IS NULL OR container_type = '')", Time.now - age).destroy_all
-  end
-
-  private
-
-  # Physically deletes the file from the file system
-  def delete_from_disk!
-    if disk_filename.present? && File.exist?(diskfile)
-      File.delete(diskfile)
-    end
-  end
-
   def sanitize_filename(value)
     # get only the filename, not the whole path
     just_filename = value.gsub(/^.*(\\|\/)/, '')
+    # NOTE: File.basename doesn't work right with Windows paths on Unix
+    # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
 
-    # Finally, replace invalid characters with underscore
+    # Finally, replace all non alphanumeric, hyphens or periods with underscore
-    @filename = just_filename.gsub(/[\/\?\%\*\:\|\"\'<>]+/, '_')
+    @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
   end
   
   # Returns an ASCII or hashed filename
   def self.disk_filename(filename)
-    timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
+    df = DateTime.now.strftime("%y%m%d%H%M%S") + "_"
-    ascii = ''
     if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
-      ascii = filename
+      df << filename
     else
-      ascii = Digest::MD5.hexdigest(filename)
+      df << Digest::MD5.hexdigest(filename)
       # keep the extension if any
-      ascii << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
+      df << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
     end
-    while File.exist?(File.join(@@storage_path, "#{timestamp}_#{ascii}"))
+    df
-      timestamp.succ!
-    end
-    "#{timestamp}_#{ascii}"
   end
 end

app/models/auth_source.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -15,15 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-# Generic exception for when the AuthSource can not be reached
-# (eg. can not connect to the LDAP)
-class AuthSourceException < Exception; end
-class AuthSourceTimeoutException < AuthSourceException; end
-
 class AuthSource < ActiveRecord::Base
-  include Redmine::SubclassFactory
-  include Redmine::Ciphering
-
   has_many :users
   
   validates_presence_of :name
@@ -40,31 +32,13 @@ class AuthSource < ActiveRecord::Base
     "Abstract"
   end
 
-  def account_password
-    read_ciphered_attribute(:account_password)
-  end
-
-  def account_password=(arg)
-    write_ciphered_attribute(:account_password, arg)
-  end
-
-  def allow_password_changes?
-    self.class.allow_password_changes?
-  end
-
-  # Does this auth source backend allow password changes?
-  def self.allow_password_changes?
-    false
-  end
-
   # Try to authenticate a user not yet registered against available sources
   def self.authenticate(login, password)
-    AuthSource.where(:onthefly_register => true).all.each do |source|
+    AuthSource.find(:all, :conditions => ["onthefly_register=?", true]).each do |source|
       begin
         logger.debug "Authenticating '#{login}' against '#{source.name}'" if logger && logger.debug?
         attrs = source.authenticate(login, password)
-      rescue => e
+      rescue
-        logger.error "Error during authentication: #{e.message}"
         attrs = nil
       end
       return attrs if attrs

app/models/auth_source_ldap.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -15,87 +15,63 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'iconv'
 require 'net/ldap'
-require 'net/ldap/dn'
+require 'iconv'
-require 'timeout'
 
 class AuthSourceLdap < AuthSource 
   validates_presence_of :host, :port, :attr_login
-  validates_length_of :name, :host, :maximum => 60, :allow_nil => true
+  validates_length_of :name, :host, :account_password, :maximum => 60, :allow_nil => true
-  validates_length_of :account, :account_password, :base_dn, :filter, :maximum => 255, :allow_blank => true
+  validates_length_of :account, :base_dn, :maximum => 255, :allow_nil => true
   validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
   validates_numericality_of :port, :only_integer => true
-  validates_numericality_of :timeout, :only_integer => true, :allow_blank => true
-  validate :validate_filter
   
-  before_validation :strip_ldap_attributes
+  def after_initialize
-
-  def initialize(attributes=nil, *args)
-    super
     self.port = 389 if self.port == 0
   end
   
   def authenticate(login, password)
     return nil if login.blank? || password.blank?
-
+    attrs = []
-    with_timeout do
+    # get user's DN
-      attrs = get_user_dn(login, password)
+    ldap_con = initialize_ldap_con(self.account, self.account_password)
-      if attrs && attrs[:dn] && authenticate_dn(attrs[:dn], password)
+    login_filter = Net::LDAP::Filter.eq( self.attr_login, login ) 
-        logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
+    object_filter = Net::LDAP::Filter.eq( "objectClass", "*" ) 
-        return attrs.except(:dn)
+    dn = String.new
-      end
+    ldap_con.search( :base => self.base_dn, 
+                     :filter => object_filter & login_filter, 
+                     # only ask for the DN if on-the-fly registration is disabled
+                     :attributes=> (onthefly_register? ? ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail] : ['dn'])) do |entry|
+      dn = entry.dn
+      attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
+               :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
+               :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
+               :auth_source_id => self.id ] if onthefly_register?
     end
-  rescue Net::LDAP::LdapError => e
+    return nil if dn.empty?
-    raise AuthSourceException.new(e.message)
+    logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
+    # authenticate user
+    ldap_con = initialize_ldap_con(dn, password)
+    return nil unless ldap_con.bind
+    # return user's attributes
+    logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
+    attrs    
+  rescue  Net::LDAP::LdapError => text
+    raise "LdapError: " + text
   end
 
   # test the connection to the LDAP
   def test_connection
-    with_timeout do
+    ldap_con = initialize_ldap_con(self.account, self.account_password)
-      ldap_con = initialize_ldap_con(self.account, self.account_password)
+    ldap_con.open { }
-      ldap_con.open { }
+  rescue  Net::LDAP::LdapError => text
-    end
+    raise "LdapError: " + text
-  rescue Net::LDAP::LdapError => e
-    raise AuthSourceException.new(e.message)
   end
  
   def auth_method_name
     "LDAP"
   end
   
-  private
+private
-
-  def with_timeout(&block)
-    timeout = self.timeout
-    timeout = 20 unless timeout && timeout > 0
-    Timeout.timeout(timeout) do
-      return yield
-    end
-  rescue Timeout::Error => e
-    raise AuthSourceTimeoutException.new(e.message)
-  end
-
-  def ldap_filter
-    if filter.present?
-      Net::LDAP::Filter.construct(filter)
-    end
-  rescue Net::LDAP::LdapError
-    nil
-  end
-
-  def validate_filter
-    if filter.present? && ldap_filter.nil?
-      errors.add(:filter, :invalid)
-    end
-  end
-
-  def strip_ldap_attributes
-    [:attr_login, :attr_firstname, :attr_lastname, :attr_mail].each do |attr|
-      write_attribute(attr, read_attribute(attr).strip) unless read_attribute(attr).nil?
-    end
-  end
-
   def initialize_ldap_con(ldap_user, ldap_password)
     options = { :host => self.host,
                 :port => self.port,
@@ -105,69 +81,7 @@ class AuthSourceLdap < AuthSource
     Net::LDAP.new options
   end
   
-  def get_user_attributes_from_ldap_entry(entry)
-    {
-     :dn => entry.dn,
-     :firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
-     :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
-     :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
-     :auth_source_id => self.id
-    }
-  end
-
-  # Return the attributes needed for the LDAP search.  It will only
-  # include the user attributes if on-the-fly registration is enabled
-  def search_attributes
-    if onthefly_register?
-      ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]
-    else
-      ['dn']
-    end
-  end
-
-  # Check if a DN (user record) authenticates with the password
-  def authenticate_dn(dn, password)
-    if dn.present? && password.present?
-      initialize_ldap_con(dn, password).bind
-    end
-  end
-
-  # Get the user's dn and any attributes for them, given their login
-  def get_user_dn(login, password)
-    ldap_con = nil
-    if self.account && self.account.include?("$login")
-      ldap_con = initialize_ldap_con(self.account.sub("$login", Net::LDAP::DN.escape(login)), password)
-    else
-      ldap_con = initialize_ldap_con(self.account, self.account_password)
-    end
-    login_filter = Net::LDAP::Filter.eq( self.attr_login, login )
-    object_filter = Net::LDAP::Filter.eq( "objectClass", "*" )
-    attrs = {}
-
-    search_filter = object_filter & login_filter
-    if f = ldap_filter
-      search_filter = search_filter & f
-    end
-
-    ldap_con.search( :base => self.base_dn,
-                     :filter => search_filter,
-                     :attributes=> search_attributes) do |entry|
-
-      if onthefly_register?
-        attrs = get_user_attributes_from_ldap_entry(entry)
-      else
-        attrs = {:dn => entry.dn}
-      end
-
-      logger.debug "DN found for #{login}: #{attrs[:dn]}" if logger && logger.debug?
-    end
-
-    attrs
-  end
-
   def self.get_attr(entry, attr_name)
-    if !attr_name.blank?
+    entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
-      entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
-    end
   end
 end

app/models/board.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,74 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Board < ActiveRecord::Base
-  include Redmine::SafeAttributes
   belongs_to :project
   has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
-  has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
+  has_many :messages, :dependent => :delete_all, :order => "#{Message.table_name}.created_on DESC"
   belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
-  acts_as_tree :dependent => :nullify
+  acts_as_list :scope => :project_id
-  acts_as_list :scope => '(project_id = #{project_id} AND parent_id #{parent_id ? "= #{parent_id}" : "IS NULL"})'
   acts_as_watchable
   
   validates_presence_of :name, :description
   validates_length_of :name, :maximum => 30
   validates_length_of :description, :maximum => 255
-  validate :validate_board
-
-  scope :visible, lambda {|*args| { :include => :project,
-                                          :conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } }
-
-  safe_attributes 'name', 'description', 'parent_id', 'move_to'
-
-  def visible?(user=User.current)
-    !user.nil? && user.allowed_to?(:view_messages, project)
-  end
-
-  def reload(*args)
-    @valid_parents = nil
-    super
-  end
-
-  def to_s
-    name
-  end
-
-  def valid_parents
-    @valid_parents ||= project.boards - self_and_descendants
-  end
-
-  def reset_counters!
-    self.class.reset_counters!(id)
-  end
-
-  # Updates topics_count, messages_count and last_message_id attributes for +board_id+
-  def self.reset_counters!(board_id)
-    board_id = board_id.to_i
-    update_all("topics_count = (SELECT COUNT(*) FROM #{Message.table_name} WHERE board_id=#{board_id} AND parent_id IS NULL)," +
-               " messages_count = (SELECT COUNT(*) FROM #{Message.table_name} WHERE board_id=#{board_id})," +
-               " last_message_id = (SELECT MAX(id) FROM #{Message.table_name} WHERE board_id=#{board_id})",
-               ["id = ?", board_id])
-  end
-
-  def self.board_tree(boards, parent_id=nil, level=0)
-    tree = []
-    boards.select {|board| board.parent_id == parent_id}.sort_by(&:position).each do |board|
-      tree << [board, level]
-      tree += board_tree(boards, board.id, level+1)
-    end
-    if block_given?
-      tree.each do |board, level|
-        yield board, level
-      end
-    end
-    tree
-  end
-
-  protected
-
-  def validate_board
-    if parent_id && parent_id_changed?
-      errors.add(:parent_id, :invalid) unless valid_parents.include?(parent)
-    end
-  end
 end

app/models/change.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -19,19 +19,8 @@ class Change < ActiveRecord::Base
   belongs_to :changeset
   
   validates_presence_of :changeset_id, :action, :path
-  before_save :init_path
-  before_validation :replace_invalid_utf8_of_path
   
   def relative_path
     changeset.repository.relative_path(path)
   end
-
-  def replace_invalid_utf8_of_path
-    self.path      = Redmine::CodesetUtil.replace_invalid_utf8(self.path)
-    self.from_path = Redmine::CodesetUtil.replace_invalid_utf8(self.from_path)
-  end
-
-  def init_path
-    self.path ||= ""
-  end
 end

app/models/changeset.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -15,26 +15,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'iconv'
-
 class Changeset < ActiveRecord::Base
   belongs_to :repository
-  belongs_to :user
+  has_many :changes, :dependent => :delete_all
-  has_many :filechanges, :class_name => 'Change', :dependent => :delete_all
   has_and_belongs_to_many :issues
-  has_and_belongs_to_many :parents,
-                          :class_name => "Changeset",
-                          :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
-                          :association_foreign_key => 'parent_id', :foreign_key => 'changeset_id'
-  has_and_belongs_to_many :children,
-                          :class_name => "Changeset",
-                          :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
-                          :association_foreign_key => 'changeset_id', :foreign_key => 'parent_id'
 
-  acts_as_event :title => Proc.new {|o| o.title},
+  acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
-                :description => :long_comments,
+                :description => :comments,
                 :datetime => :committed_on,
-                :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}}
+                :author => :committer,
+                :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
                 
   acts_as_searchable :columns => 'comments',
                      :include => {:repository => :project},
@@ -42,31 +32,18 @@ class Changeset < ActiveRecord::Base
                      :date_column => 'committed_on'
                      
   acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
-                            :author_key => :user_id,
+                            :find_options => {:include => {:repository => :project}}
-                            :find_options => {:include => [:user, {:repository => :project}]}
   
   validates_presence_of :repository_id, :revision, :committed_on, :commit_date
   validates_uniqueness_of :revision, :scope => :repository_id
   validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
   
-  scope :visible,
-     lambda {|*args| { :include => {:repository => :project},
-                                          :conditions => Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args) } }
-
-  after_create :scan_for_issues
-  before_create :before_create_cs
-
   def revision=(r)
     write_attribute :revision, (r.nil? ? nil : r.to_s)
   end
   
-  # Returns the identifier of this changeset; depending on repository backends
+  def comments=(comment)
-  def identifier
+    write_attribute(:comments, comment.strip)
-    if repository.class.respond_to? :changeset_identifier
-      repository.class.changeset_identifier self
-    else
-      revision.to_s
-    end
   end
 
   def committed_on=(date)
@@ -74,207 +51,84 @@ class Changeset < ActiveRecord::Base
     super
   end
   
-  # Returns the readable identifier
-  def format_identifier
-    if repository.class.respond_to? :format_changeset_identifier
-      repository.class.format_changeset_identifier self
-    else
-      identifier
-    end
-  end
-
   def project
     repository.project
   end
   
-  def author
+  def after_create
-    user || committer.to_s.split('<').first
-  end
-
-  def before_create_cs
-    self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
-    self.comments  = self.class.normalize_comments(
-                       self.comments, repository.repo_log_encoding)
-    self.user = repository.find_committer_user(self.committer)
-  end
-
-  def scan_for_issues
     scan_comment_for_issue_ids
   end
-
+  require 'pp'
-  TIMELOG_RE = /
-    (
-    ((\d+)(h|hours?))((\d+)(m|min)?)?
-    |
-    ((\d+)(h|hours?|m|min))
-    |
-    (\d+):(\d+)
-    |
-    (\d+([\.,]\d+)?)h?
-    )
-    /x
   
   def scan_comment_for_issue_ids
     return if comments.blank?
     # keywords used to reference issues
     ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
-    ref_keywords_any = ref_keywords.delete('*')
     # keywords used to fix issues
     fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
+    # status and optional done ratio applied
+    fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
+    done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
     
     kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
+    return if kw_regexp.blank?
     
     referenced_issues = []
     
-    comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|
+    if ref_keywords.delete('*')
-      action, refs = match[2], match[3]
+      # find any issue ID in the comments
-      next unless action.present? || ref_keywords_any
+      target_issue_ids = []
+      comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
+      referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
+    end
     
-      refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|
+    comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
-        issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2]
+      action = match[0]
-        if issue
+      target_issue_ids = match[1].scan(/\d+/)
-          referenced_issues << issue
+      target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
-          fix_issue(issue) if fix_keywords.include?(action.to_s.downcase)
+      if fix_status && fix_keywords.include?(action.downcase)
-          log_time(issue, hours) if hours && Setting.commit_logtime_enabled?
+        # update status of issues
+        logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
+        target_issues.each do |issue|
+          # the issue may have been updated by the closure of another one (eg. duplicate)
+          issue.reload
+          # don't change the status is the issue is closed
+          next if issue.status.is_closed?
+          user = committer_user || User.anonymous
+          csettext = "r#{self.revision}"
+          if self.scmid && (! (csettext =~ /^r[0-9]+$/))
+            csettext = "commit:\"#{self.scmid}\""
+          end
+          journal = issue.init_journal(user, l(:text_status_changed_by_changeset, csettext))
+          issue.status = fix_status
+          issue.done_ratio = done_ratio if done_ratio
+          issue.save
+          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
         end
       end
+      referenced_issues += target_issues
     end
     
-    referenced_issues.uniq!
+    self.issues = referenced_issues.uniq
-    self.issues = referenced_issues unless referenced_issues.empty?
   end
 
-  def short_comments
+  # Returns the Redmine User corresponding to the committer
-    @short_comments || split_comments.first
+  def committer_user
-  end
+    if committer && committer.strip =~ /^([^<]+)(<(.*)>)?$/
-
+      username, email = $1.strip, $3
-  def long_comments
+      u = User.find_by_login(username)
-    @long_comments || split_comments.last
+      u ||= User.find_by_mail(email) unless email.blank?
-  end
+      u
-
-  def text_tag(ref_project=nil)
-    tag = if scmid?
-      "commit:#{scmid}"
-    else
-      "r#{revision}"
     end
-    if repository && repository.identifier.present?
-      tag = "#{repository.identifier}|#{tag}"
-    end
-    if ref_project && project && ref_project != project
-      tag = "#{project.identifier}:#{tag}"
-    end
-    tag
-  end
-
-  # Returns the title used for the changeset in the activity/search results
-  def title
-    repo = (repository && repository.identifier.present?) ? " (#{repository.identifier})" : ''
-    comm = short_comments.blank? ? '' : (': ' + short_comments)
-    "#{l(:label_revision)} #{format_identifier}#{repo}#{comm}"
   end
   
   # Returns the previous changeset
   def previous
-    @previous ||= Changeset.where(["id < ? AND repository_id = ?", id, repository_id]).order('id DESC').first
+    @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
   end
 
   # Returns the next changeset
   def next
-    @next ||= Changeset.where(["id > ? AND repository_id = ?", id, repository_id]).order('id ASC').first
+    @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
-  end
-
-  # Creates a new Change from it's common parameters
-  def create_change(change)
-    Change.create(:changeset     => self,
-                  :action        => change[:action],
-                  :path          => change[:path],
-                  :from_path     => change[:from_path],
-                  :from_revision => change[:from_revision])
-  end
-
-  # Finds an issue that can be referenced by the commit message
-  def find_referenced_issue_by_id(id)
-    return nil if id.blank?
-    issue = Issue.find_by_id(id.to_i, :include => :project)
-    if Setting.commit_cross_project_ref?
-      # all issues can be referenced/fixed
-    elsif issue
-      # issue that belong to the repository project, a subproject or a parent project only
-      unless issue.project &&
-                (project == issue.project || project.is_ancestor_of?(issue.project) ||
-                 project.is_descendant_of?(issue.project))
-        issue = nil
-      end
-    end
-    issue
-  end
-
-  private
-
-  def fix_issue(issue)
-    status = IssueStatus.find_by_id(Setting.commit_fix_status_id.to_i)
-    if status.nil?
-      logger.warn("No status matches commit_fix_status_id setting (#{Setting.commit_fix_status_id})") if logger
-      return issue
-    end
-
-    # the issue may have been updated by the closure of another one (eg. duplicate)
-    issue.reload
-    # don't change the status is the issue is closed
-    return if issue.status && issue.status.is_closed?
-
-    journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, text_tag(issue.project)))
-    issue.status = status
-    unless Setting.commit_fix_done_ratio.blank?
-      issue.done_ratio = Setting.commit_fix_done_ratio.to_i
-    end
-    Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
-                            { :changeset => self, :issue => issue })
-    unless issue.save
-      logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
-    end
-    issue
-  end
-
-  def log_time(issue, hours)
-    time_entry = TimeEntry.new(
-      :user => user,
-      :hours => hours,
-      :issue => issue,
-      :spent_on => commit_date,
-      :comments => l(:text_time_logged_by_changeset, :value => text_tag(issue.project),
-                     :locale => Setting.default_language)
-      )
-    time_entry.activity = log_time_activity unless log_time_activity.nil?
-
-    unless time_entry.save
-      logger.warn("TimeEntry could not be created by changeset #{id}: #{time_entry.errors.full_messages}") if logger
-    end
-    time_entry
-  end
-
-  def log_time_activity
-    if Setting.commit_logtime_activity_id.to_i > 0
-      TimeEntryActivity.find_by_id(Setting.commit_logtime_activity_id.to_i)
-    end
-  end
-
-  def split_comments
-    comments =~ /\A(.+?)\r?\n(.*)$/m
-    @short_comments = $1 || comments
-    @long_comments = $2.to_s.strip
-    return @short_comments, @long_comments
-  end
-
-  public
-
-  # Strips and reencodes a commit log before insertion into the database
-  def self.normalize_comments(str, encoding)
-    Changeset.to_utf8(str.to_s.strip, encoding)
-  end
-
-  def self.to_utf8(str, encoding)
-    Redmine::CodesetUtil.to_utf8(str, encoding)
   end
 end

app/models/comment.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -16,11 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Comment < ActiveRecord::Base
-  include Redmine::SafeAttributes
   belongs_to :commented, :polymorphic => true, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
   validates_presence_of :commented, :author, :comments
-
-  safe_attributes 'comments'
 end