tagged version 0.4.2

git-svn-id: http://redmine.rubyforge.org/svn/tags/0.4.2@260 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/apis/sys_api.rb

@@ -1,25 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class SysApi < ActionWebService::API::Base
-  api_method :projects,
-             :expects => [],
-             :returns => [[Project]]
-  api_method :repository_created,
-             :expects => [:int, :string],
-             :returns => [:int]
-end

app/controllers/account_controller.rb

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

app/controllers/admin_controller.rb

@@ -1,66 +1,55 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class AdminController < ApplicationController
+class AdminController < ApplicationController
-  layout 'base'	
+  layout 'base'	
-  before_filter :require_admin
+  before_filter :require_admin
-
+
-  helper :sort
+  helper :sort
-  include SortHelper	
+  include SortHelper	
-
+
-  def index	
+  def index	
-  end
+  end
-	
+	
-  def projects
+  def projects
-    sort_init 'name', 'asc'
+    sort_init 'name', 'asc'
-    sort_update
+    sort_update		
-    
+    @project_count = Project.count		
-    @status = params[:status] ? params[:status].to_i : 0
+    @project_pages = Paginator.new self, @project_count,
-    conditions = nil
+								15,
-    conditions = ["status=?", @status] unless @status == 0
+								params['page']								
-    
+    @projects = Project.find :all, :order => sort_clause,
-    @project_count = Project.count(:conditions => conditions)
+						:limit  =>  @project_pages.items_per_page,
-    @project_pages = Paginator.new self, @project_count,
+						:offset =>  @project_pages.current.offset
-								25,
+
-								params['page']								
+    render :action => "projects", :layout => false if request.xhr?
-    @projects = Project.find :all, :order => sort_clause,
+  end
-                        :conditions => conditions,
+
-						:limit  =>  @project_pages.items_per_page,
+  def mail_options
-						:offset =>  @project_pages.current.offset
+    @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || []
-
+    if request.post?
-    render :action => "projects", :layout => false if request.xhr?
+      @actions.each { |a|
-  end
+        a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s 
-
+        a.save
-  def mail_options
+      }
-    @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || []
+      flash.now[:notice] = l(:notice_successful_update)
-    if request.post?
+    end
-      @actions.each { |a|
+  end
-        a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s 
+  
-        a.save
+  def info
-      }
+  end  
-      flash.now[:notice] = l(:notice_successful_update)
-    end
-  end
-  
-  def info
-    @db_adapter_name = ActiveRecord::Base.connection.adapter_name
-    @flags = Hash.new
-    @flags[:default_admin_changed] = User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?
-    @flags[:file_repository_writable] = File.writable?(Attachment.storage_path)
-    @flags[:textile_available] = ActionView::Helpers::TextHelper.method_defined? "textilize"
-  end  
 end

app/controllers/application.rb

@@ -1,131 +1,94 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class ApplicationController < ActionController::Base
+class ApplicationController < ActionController::Base
-  before_filter :check_if_login_required, :set_localization
+  before_filter :check_if_login_required, :set_localization
-  filter_parameter_logging :password
+  
-  
+  def logged_in_user=(user)
-  REDMINE_SUPPORTED_SCM.each do |scm|
+    @logged_in_user = user
-    require_dependency "repository/#{scm.underscore}"
+    session[:user_id] = (user ? user.id : nil)
-  end
+  end
-  
+  
-  def logged_in_user=(user)
+  def logged_in_user
-    @logged_in_user = user
+    if session[:user_id]
-    session[:user_id] = (user ? user.id : nil)
+      @logged_in_user ||= User.find(session[:user_id])
-  end
+    else
-  
+      nil
-  def logged_in_user
+    end
-    if session[:user_id]
+  end
-      @logged_in_user ||= User.find(session[:user_id])
+  
-    else
+  # check if login is globally required to access the application
-      nil
+  def check_if_login_required
-    end
+    require_login if Setting.login_required?
-  end
+  end 
-  
+  
-  # Returns the role that the logged in user has on the current project
+  def set_localization
-  # or nil if current user is not a member of the project
+    lang = begin
-  def logged_in_user_membership
+      if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym
-    @user_membership ||= logged_in_user.role_for_project(@project)
+        self.logged_in_user.language
-  end
+      elsif request.env['HTTP_ACCEPT_LANGUAGE']
-  
+        accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
-  # check if login is globally required to access the application
+        if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
-  def check_if_login_required
+          accept_lang
-    # no check needed if user is already logged in
+        end
-    return true if logged_in_user
+      end
-    # auto-login feature
+    rescue
-    autologin_key = cookies[:autologin]
+      nil
-    if autologin_key && Setting.autologin?
+    end || Setting.default_language
-      self.logged_in_user = User.find_by_autologin_key(autologin_key)
+    set_language_if_valid(lang)    
-    end
+  end
-    require_login if Setting.login_required?
+  
-  end 
+  def require_login
-  
+    unless self.logged_in_user
-  def set_localization
+      store_location
-    lang = begin
+      redirect_to :controller => "account", :action => "login"
-      if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym
+      return false
-        self.logged_in_user.language
+    end
-      elsif request.env['HTTP_ACCEPT_LANGUAGE']
+    true
-        accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
+  end
-        if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
+
-          accept_lang
+  def require_admin
-        end
+    return unless require_login
-      end
+    unless self.logged_in_user.admin?
-    rescue
+      render :nothing => true, :status => 403
-      nil
+      return false
-    end || Setting.default_language
+    end
-    set_language_if_valid(lang)    
+    true
-  end
+  end
-  
+
-  def require_login
+  # authorizes the user for the requested action.
-    unless self.logged_in_user
+  def authorize(ctrl = params[:controller], action = params[:action])
-      store_location
+    # check if action is allowed on public projects
-      redirect_to :controller => "account", :action => "login"
+    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ ctrl, action ]
-      return false
+      return true
-    end
+    end    
-    true
+    # if action is not public, force login
-  end
+    return unless require_login    
-
+    # admin is always authorized
-  def require_admin
+    return true if self.logged_in_user.admin?
-    return unless require_login
+    # if not admin, check membership permission    
-    unless self.logged_in_user.admin?
+    @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id])    
-      render_403
+    if @user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], @user_membership.role_id )    
-      return false
+      return true		
-    end
+    end		
-    true
+    render :nothing => true, :status => 403
-  end
+    false
-
+  end
-  # authorizes the user for the requested action.
+
-  def authorize(ctrl = params[:controller], action = params[:action])
-    unless @project.active?
-      @project = nil
-      render_404
-      return false
-    end
-    # check if action is allowed on public projects
-    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ ctrl, action ]
-      return true
-    end    
-    # if action is not public, force login
-    return unless require_login    
-    # admin is always authorized
-    return true if self.logged_in_user.admin?
-    # if not admin, check membership permission    
-    if logged_in_user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], logged_in_user_membership )    
-      return true		
-    end		
-    render_403
-    false
-  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
-    unless @project.active?
-      @project = nil
-      render_404
-      return false
-    end
-    return true if @project.is_public?
-    return false unless logged_in_user
-    return true if logged_in_user.admin? || logged_in_user_membership
-    render_403
-    false
-  end
-
   # store current uri in session.
   # return to this location by calling redirect_back_or_default
   def store_location
@@ -140,37 +103,30 @@ class ApplicationController < ActionController::Base
       redirect_to session[:return_to_params]
       session[:return_to_params] = nil
     end
+  end
+  
+  def render_404
+    @html_title = "404"
+    render :template => "common/404", :layout => true, :status => 404
+    return false
   end
-  
+
-  def render_403
+  # qvalues http header parser
-    @html_title = "403"
+  # code taken from webrick
-    @project = nil
+  def parse_qvalues(value)
-    render :template => "common/403", :layout => true, :status => 403
+    tmp = []
-    return false
+    if value
-  end
+      parts = value.split(/,\s*/)
-    
+      parts.each {|part|
-  def render_404
+        if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
-    @html_title = "404"
+          val = m[1]
-    render :template => "common/404", :layout => true, :status => 404
+          q = (m[2] or 1).to_f
-    return false
+          tmp.push([val, q])
-  end
+        end
-
+      }
-  # qvalues http header parser
+      tmp = tmp.sort_by{|val, q| -q}
-  # code taken from webrick
+      tmp.collect!{|val, q| val}
-  def parse_qvalues(value)
+    end
-    tmp = []
+    return tmp
-    if value
+  end
-      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
 end

app/controllers/attachments_controller.rb

@@ -1,44 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class AttachmentsController < ApplicationController
-  layout 'base'
-  before_filter :find_project, :check_project_privacy
-
-  # sends an attachment
-  def download
-    send_file @attachment.diskfile, :filename => @attachment.filename
-  rescue
-    render_404
-  end
-    
-  # sends an image to be displayed inline
-  def show
-    render(:nothing => true, :status => 404) and return unless @attachment.diskfile =~ /\.(jpeg|jpg|gif|png)$/i
-    send_file @attachment.diskfile, :filename => @attachment.filename, :type => "image/#{$1}", :disposition => 'inline'
-  rescue
-    render_404
-  end
- 
-private
-  def find_project
-    @attachment = Attachment.find(params[:id])
-    @project = @attachment.project
-  rescue
-    render_404
-  end
-end

app/controllers/boards_controller.rb

@@ -1,89 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class BoardsController < ApplicationController
-  layout 'base'
-  before_filter :find_project
-  before_filter :authorize, :except => [:index, :show]
-  before_filter :check_project_privacy, :only => [:index, :show]
-
-  helper :messages
-  include MessagesHelper
-  helper :sort
-  include SortHelper
-  helper :watchers
-  include WatchersHelper
- 
-  def index
-    @boards = @project.boards
-    # show the board if there is only one
-    if @boards.size == 1
-      @board = @boards.first
-      show
-      render :action => 'show'
-    end
-  end
-
-  def show
-    sort_init "#{Message.table_name}.updated_on", "desc"
-    sort_update	
-      
-    @topic_count = @board.topics.count
-    @topic_pages = Paginator.new self, @topic_count, 25, params['page']
-    @topics =  @board.topics.find :all, :order => sort_clause,
-                                  :include => [:author, {:last_reply => :author}],
-                                  :limit  =>  @topic_pages.items_per_page,
-                                  :offset =>  @topic_pages.current.offset
-    render :action => 'show', :layout => false if request.xhr?
-  end
-  
-  verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
-
-  def new
-    @board = Board.new(params[:board])
-    @board.project = @project
-    if request.post? && @board.save
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
-    end
-  end
-
-  def edit
-    if request.post? && @board.update_attributes(params[:board])
-      case params[:position]
-      when 'highest'; @board.move_to_top
-      when 'higher'; @board.move_higher
-      when 'lower'; @board.move_lower
-      when 'lowest'; @board.move_to_bottom
-      end if params[:position]
-      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
-    end
-  end
-
-  def destroy
-    @board.destroy
-    redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
-  end
-  
-private
-  def find_project
-    @project = Project.find(params[:project_id])
-    @board = @project.boards.find(params[:id]) if params[:id]
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/custom_fields_controller.rb

@@ -1,23 +1,23 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class CustomFieldsController < ApplicationController
+class CustomFieldsController < ApplicationController
-  layout 'base'		
+  layout 'base'		
-  before_filter :require_admin
+  before_filter :require_admin
 
   def index
     list
@@ -25,48 +25,48 @@ class CustomFieldsController < ApplicationController
   end
 
   def list
-    @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.type.to_s }
+    @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.type.to_s }
-    @tab = params[:tab] || 'IssueCustomField'
+    @tab = params[:tab] || 'IssueCustomField'
     render :action => "list", :layout => false if request.xhr?
   end
-  
+  
-  def new
+  def new
-    case params[:type]
+    case params[:type]
-      when "IssueCustomField" 
+      when "IssueCustomField" 
-        @custom_field = IssueCustomField.new(params[:custom_field])
+        @custom_field = IssueCustomField.new(params[:custom_field])
-        @custom_field.trackers = Tracker.find(params[:tracker_ids]) if params[:tracker_ids]
+        @custom_field.trackers = Tracker.find(params[:tracker_ids]) if params[:tracker_ids]
-      when "UserCustomField" 
+      when "UserCustomField" 
-        @custom_field = UserCustomField.new(params[:custom_field])
+        @custom_field = UserCustomField.new(params[:custom_field])
-      when "ProjectCustomField" 
+      when "ProjectCustomField" 
-        @custom_field = ProjectCustomField.new(params[:custom_field])
+        @custom_field = ProjectCustomField.new(params[:custom_field])
-      else
+      else
-        redirect_to :action => 'list'
+        redirect_to :action => 'list'
-        return
+        return
-    end  
+    end  
-    if request.post? and @custom_field.save
+    if request.post? and @custom_field.save
-      flash[:notice] = l(:notice_successful_create)
+      flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'list', :tab => @custom_field.type
+      redirect_to :action => 'list', :tab => @custom_field.type
-    end
+    end
-    @trackers = Tracker.find(:all, :order => 'position')
+    @trackers = Tracker.find(:all, :order => 'position')
-  end
+  end
-
+
-  def edit
+  def edit
-    @custom_field = CustomField.find(params[:id])
+    @custom_field = CustomField.find(params[:id])
-    if request.post? and @custom_field.update_attributes(params[:custom_field])
+    if request.post? and @custom_field.update_attributes(params[:custom_field])
-      if @custom_field.is_a? IssueCustomField
+      if @custom_field.is_a? IssueCustomField
-        @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
+        @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
-      end
+      end
-      flash[:notice] = l(:notice_successful_update)
+      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'list', :tab => @custom_field.type
+      redirect_to :action => 'list', :tab => @custom_field.type
-    end
+    end
-    @trackers = Tracker.find(:all, :order => 'position')
+    @trackers = Tracker.find(:all, :order => 'position')
-  end
+  end
 
   def destroy
-    @custom_field = CustomField.find(params[:id]).destroy
+    @custom_field = CustomField.find(params[:id]).destroy
-    redirect_to :action => 'list', :tab => @custom_field.type
+    redirect_to :action => 'list', :tab => @custom_field.type
-  rescue
+  rescue
-    flash[:notice] = "Unable to delete custom field"
+    flash[:notice] = "Unable to delete custom field"
     redirect_to :action => 'list'
-  end
+  end
 end

app/controllers/documents_controller.rb

@@ -1,71 +1,71 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class DocumentsController < ApplicationController
+  layout 'base'
+  before_filter :find_project, :authorize
 
-class DocumentsController < ApplicationController
+  def show
-  layout 'base'
-  before_filter :find_project, :authorize
-
-  def show
     @attachments = @document.attachments.find(:all, :order => "created_on DESC")
   end
 
-  def edit
+  def edit
     @categories = Enumeration::get_values('DCAT')
     if request.post? and @document.update_attributes(params[:document])
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'show', :id => @document
     end
-  end  
+  end  
 
   def destroy
     @document.destroy
     redirect_to :controller => 'projects', :action => 'list_documents', :id => @project
+  end
+
+  def download
+    @attachment = @document.attachments.find(params[:attachment_id])
+    @attachment.increment_download
+    send_file @attachment.diskfile, :filename => @attachment.filename
+  rescue
+    render_404
+  end 
+  
+  def add_attachment
+    # Save the attachments
+    @attachments = []
+    params[:attachments].each { |file|
+      next unless file.size > 0
+      a = Attachment.create(:container => @document, :file => file, :author => logged_in_user)
+      @attachments << a unless a.new_record?
+    } if params[:attachments] and params[:attachments].is_a? Array
+    Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
+    redirect_to :action => 'show', :id => @document
+  end
+  
+  def destroy_attachment
+    @document.attachments.find(params[:attachment_id]).destroy
+    redirect_to :action => 'show', :id => @document
   end
-
+
-  def download
+private
-    @attachment = @document.attachments.find(params[:attachment_id])
+  def find_project
-    @attachment.increment_download
+    @document = Document.find(params[:id])
-    send_file @attachment.diskfile, :filename => @attachment.filename
+    @project = @document.project
-  rescue
+  rescue ActiveRecord::RecordNotFound
-    render_404
+    render_404
-  end 
-  
-  def add_attachment
-    # Save the attachments
-    @attachments = []
-    params[:attachments].each { |file|
-      next unless file.size > 0
-      a = Attachment.create(:container => @document, :file => file, :author => logged_in_user)
-      @attachments << a unless a.new_record?
-    } if params[:attachments] and params[:attachments].is_a? Array
-    Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-    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
-    @document = Document.find(params[:id])
-    @project = @document.project
-  rescue ActiveRecord::RecordNotFound
-    render_404
   end  
 end

app/controllers/enumerations_controller.rb

@@ -1,23 +1,23 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class EnumerationsController < ApplicationController
+class EnumerationsController < ApplicationController
-  layout 'base'
+  layout 'base'
-  before_filter :require_admin
+  before_filter :require_admin
   
   def index
     list
@@ -60,11 +60,11 @@ class EnumerationsController < ApplicationController
   end
 
   def destroy
-    Enumeration.find(params[:id]).destroy
+    Enumeration.find(params[:id]).destroy
     flash[:notice] = l(:notice_successful_delete)
-    redirect_to :action => 'list'
+    redirect_to :action => 'list'
-  rescue
+  rescue
-    flash[:notice] = "Unable to delete enumeration"
+    flash[:notice] = "Unable to delete enumeration"
     redirect_to :action => 'list'
   end
 end

app/controllers/feeds_controller.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  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,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class FeedsController < ApplicationController
-  before_filter :find_scope
   session :off
-
+  
-  helper :issues
-  include IssuesHelper
-  helper :custom_fields
-  include CustomFieldsHelper
-    
-  # news feeds
   def news
-    News.with_scope(:find => @find_options) do
+    @news = News.find :all, :order => 'news.created_on DESC', :limit => 10, :include => [ :author, :project ]
-      @news = News.find :all, :order => "#{News.table_name}.created_on DESC", :include => [ :author, :project ]
-    end
     headers["Content-Type"] = "application/rss+xml"
-    render :action => 'news_atom' if 'atom' == params[:format]
-  end
-  
-  # issue feeds
-  def issues
-    if @project && params[:query_id]
-      query = Query.find(params[:query_id])
-      query.executed_by = @user
-      # ignore query if it's not valid
-      query = nil unless query.valid?
-      # override with query conditions
-      @find_options[:conditions] = query.statement if query.valid? and @project == query.project
-    end
-
-    Issue.with_scope(:find => @find_options) do
-      @issues = Issue.find :all, :include => [:project, :author, :tracker, :status, :custom_values], 
-                                 :order => "#{Issue.table_name}.created_on DESC"
-    end
-    @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
-    headers["Content-Type"] = "application/rss+xml"
-    render :action => 'issues_atom' if 'atom' == params[:format]
-  end
-  
-  # issue changes feeds
-  def history    
-    if @project && params[:query_id]
-      query = Query.find(params[:query_id])
-      query.executed_by = @user
-      # ignore query if it's not valid
-      query = nil unless query.valid?
-      # override with query conditions
-      @find_options[:conditions] = query.statement if query.valid? and @project == query.project
-    end
-
-    Journal.with_scope(:find => @find_options) do
-      @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status, :custom_values]} ], 
-                                     :order => "#{Journal.table_name}.created_on DESC"
-    end
-    
-    @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
-    headers["Content-Type"] = "application/rss+xml"
-    render :action => 'history_atom' if 'atom' == params[:format]
-  end
-   
-private
-  # override for feeds specific authentication
-  def check_if_login_required
-    @user = User.find_by_rss_key(params[:key])
-    render(:nothing => true, :status => 403) and return false if !@user && Setting.login_required?
-  end
-  
-  def find_scope
-    if params[:project_id]
-      # project feed
-      # check if project is public or if the user is a member
-      @project = Project.find(params[:project_id])
-      render(:nothing => true, :status => 403) and return false unless @project.is_public? || (@user && @user.role_for_project(@project))
-      scope = ["#{Project.table_name}.id=?", params[:project_id].to_i]
-    else
-      # global feed
-      scope = ["#{Project.table_name}.is_public=?", true]
-    end
-    @find_options = {:conditions => scope, :limit => Setting.feeds_limit.to_i}
-    return true
   end
 end

app/controllers/help_controller.rb

@@ -1,44 +1,47 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class HelpController < ApplicationController
+class HelpController < ApplicationController
-
+
-  skip_before_filter :check_if_login_required
+  skip_before_filter :check_if_login_required
-  before_filter :load_help_config
+  before_filter :load_help_config
-
+
-  # displays help page for the requested controller/action
+  # displays help page for the requested controller/action
-  def index	
+  def index	
-    # select help page to display
+    # select help page to display
-    if params[:ctrl] and @help_config['pages'][params[:ctrl]]
+    if params[:ctrl] and @help_config['pages'][params[:ctrl]]
-      if params[:page] and @help_config['pages'][params[:ctrl]][params[:page]]
+      if params[:page] and @help_config['pages'][params[:ctrl]][params[:page]]
-        template = @help_config['pages'][params[:ctrl]][params[:page]]
+        template = @help_config['pages'][params[:ctrl]][params[:page]]
-      else
+      else
-        template = @help_config['pages'][params[:ctrl]]['index']
+        template = @help_config['pages'][params[:ctrl]]['index']
-      end
+      end
-    end
+    end
-    # choose language according to available help translations
+    # choose language according to available help translations
-    lang = (@help_config['langs'].include? current_language.to_s) ? current_language.to_s : @help_config['langs'].first
+    lang = (@help_config['langs'].include? current_language.to_s) ? current_language.to_s : @help_config['langs'].first
-	
+	
-    url = "/manual/#{lang}/" + (template || "index.html")
+    if template
-    redirect_to(request.relative_url_root + url)
+      redirect_to "/manual/#{lang}/#{template}"
-  end
+    else
-
+      redirect_to "/manual/#{lang}/index.html"
-private
+    end
-  def load_help_config
+  end
-    @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml"))
+
+private
+  def load_help_config
+    @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml"))
   end	
 end

app/controllers/issue_categories_controller.rb

@@ -1,24 +1,24 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 class IssueCategoriesController < ApplicationController
-  layout 'base'
+  layout 'base'
-  before_filter :find_project, :authorize
+  before_filter :find_project, :authorize
-
+
   def edit
     if request.post? and @category.update_attributes(params[:category])
       flash[:notice] = l(:notice_successful_update)
@@ -28,17 +28,17 @@ class IssueCategoriesController < ApplicationController
 
   def destroy
     @category.destroy
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-  rescue
+  rescue
     flash[:notice] = "Categorie can't be deleted"
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-  end
+  end
 
-private
+private
-  def find_project
+  def find_project
-    @category = IssueCategory.find(params[:id])
+    @category = IssueCategory.find(params[:id])
-    @project = @category.project
+    @project = @category.project
-  rescue ActiveRecord::RecordNotFound
+  rescue ActiveRecord::RecordNotFound
-    render_404
+    render_404
-  end    
+  end    
 end

app/controllers/issue_relations_controller.rb

@@ -1,59 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class IssueRelationsController < ApplicationController
-  layout 'base'
-  before_filter :find_project, :authorize
-  
-  def new
-    @relation = IssueRelation.new(params[:relation])
-    @relation.issue_from = @issue
-    @relation.save if request.post?
-    respond_to do |format|
-      format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
-      format.js do
-        render :update do |page|
-          page.replace_html "relations", :partial => 'issues/relations'
-          if @relation.errors.empty?
-            page << "$('relation_delay').value = ''"
-            page << "$('relation_issue_to_id').value = ''"
-          end
-        end
-      end
-    end
-  end
-  
-  def destroy
-    relation = IssueRelation.find(params[:id])
-    if request.post? && @issue.relations.include?(relation)
-      relation.destroy
-      @issue.reload
-    end
-    respond_to do |format|
-      format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
-      format.js { render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'} }
-    end
-  end
-  
-private
-  def find_project
-    @issue = Issue.find(params[:issue_id])
-    @project = @issue.project
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/issue_statuses_controller.rb

@@ -1,34 +1,34 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class IssueStatusesController < ApplicationController
+class IssueStatusesController < ApplicationController
   layout 'base'	
-  before_filter :require_admin
+  before_filter :require_admin
-
+
-  verify :method => :post, :only => [ :destroy, :create, :update, :move ],
+  verify :method => :post, :only => [ :destroy, :create, :update, :move ],
-         :redirect_to => { :action => :list }
+         :redirect_to => { :action => :list }
-         
+         
   def index
     list
     render :action => 'list' unless request.xhr?
   end
 
   def list
-    @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 25, :order => "position"
+    @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 25, :order => "position"
     render :action => "list", :layout => false if request.xhr?
   end
 
@@ -58,28 +58,28 @@ class IssueStatusesController < ApplicationController
     else
       render :action => 'edit'
     end
-  end
+  end
-  
+  
-  def move
+  def move
-    @issue_status = IssueStatus.find(params[:id])
+    @issue_status = IssueStatus.find(params[:id])
-    case params[:position]
+    case params[:position]
-    when 'highest'
+    when 'highest'
-      @issue_status.move_to_top
+      @issue_status.move_to_top
-    when 'higher'
+    when 'higher'
-      @issue_status.move_higher
+      @issue_status.move_higher
-    when 'lower'
+    when 'lower'
-      @issue_status.move_lower
+      @issue_status.move_lower
-    when 'lowest'
+    when 'lowest'
-      @issue_status.move_to_bottom
+      @issue_status.move_to_bottom
-    end if params[:position]
+    end if params[:position]
-    redirect_to :action => 'list'
+    redirect_to :action => 'list'
   end
 
   def destroy
     IssueStatus.find(params[:id]).destroy
-    redirect_to :action => 'list'
+    redirect_to :action => 'list'
-  rescue
+  rescue
-    flash[:notice] = "Unable to delete issue status"
+    flash[:notice] = "Unable to delete issue status"
     redirect_to :action => 'list'
   end  	
 end

app/controllers/issues_controller.rb

@@ -1,169 +1,149 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class IssuesController < ApplicationController
+class IssuesController < ApplicationController
-  layout 'base', :except => :export_pdf
+  layout 'base', :except => :export_pdf
-  before_filter :find_project, :authorize
+  before_filter :find_project, :authorize
-  
+
-  cache_sweeper :issue_sweeper, :only => [ :edit, :change_status, :destroy ]
+  helper :custom_fields
-
+  include CustomFieldsHelper
-  helper :projects
+  helper :ifpdf
-  include ProjectsHelper   
+  include IfpdfHelper
-  helper :custom_fields
-  include CustomFieldsHelper
-  helper :ifpdf
-  include IfpdfHelper
-  helper :issue_relations
-  include IssueRelationsHelper
-  helper :watchers
-  include WatchersHelper
-  helper :attachments
-  include AttachmentsHelper   
 
   def show
-    @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
+    @status_options = @issue.status.workflows.find(:all, :order => 'position', :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
-    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
+    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
-    @journals_count = @issue.journals.count
+    @journals_count = @issue.journals.count
-    @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "#{Journal.table_name}.created_on desc")
+    @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "journals.created_on desc")
-  end
+  end
-  
+  
-  def history
+  def history
-    @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on desc")
+    @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "journals.created_on desc")
-    @journals_count = @journals.length  
+    @journals_count = @journals.length  
-  end
+  end
-  
+  
-  def export_pdf
+  def export_pdf
-    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
+    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
-    @options_for_rfpdf ||= {}
+    @options_for_rfpdf ||= {}
-    @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.id}.pdf"
+    @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.long_id}.pdf"
   end
 
-  def edit
+  def edit
-    @priorities = Enumeration::get_values('IPRI')
+    @priorities = Enumeration::get_values('IPRI')
-    if request.get?
+    if request.get?
-      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
+      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
-    else
+    else
-      begin
+      begin
-        @issue.init_journal(self.logged_in_user)
+        @issue.init_journal(self.logged_in_user)
-        # Retrieve custom fields and values
+        # Retrieve custom fields and values
-        @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
+        @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-        @issue.custom_values = @custom_values
+        @issue.custom_values = @custom_values
-        @issue.attributes = params[:issue]
+        @issue.attributes = params[:issue]
         if @issue.save
-          flash[:notice] = l(:notice_successful_update)
+          flash[:notice] = l(:notice_successful_update)
           redirect_to :action => 'show', :id => @issue
-        end
+        end
-      rescue ActiveRecord::StaleObjectError
+      rescue ActiveRecord::StaleObjectError
-        # Optimistic locking exception
+        # Optimistic locking exception
-        flash[:notice] = l(:notice_locking_conflict)
+        flash[:notice] = l(:notice_locking_conflict)
-      end
+      end
     end		
-  end
+  end
-  
+  
-  def add_note
+  def add_note
-    unless params[:notes].empty?
+    unless params[:notes].empty?
-      journal = @issue.init_journal(self.logged_in_user, params[:notes])
+      journal = @issue.init_journal(self.logged_in_user, params[:notes])
-      if @issue.save
+      #@history = @issue.histories.build(params[:history])
-        flash[:notice] = l(:notice_successful_update)
+      #@history.author_id = self.logged_in_user.id if self.logged_in_user
-        Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
+      #@history.status = @issue.status
-        redirect_to :action => 'show', :id => @issue
+      if @issue.save
-        return
+        flash[:notice] = l(:notice_successful_update)
-      end
+        Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-    end
+        redirect_to :action => 'show', :id => @issue
-    show
+        return
-    render :action => 'show'
+      end
-  end
+    end
-
+    show
-  def change_status
+    render :action => 'show'
-    @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
+  end
-    @new_status = IssueStatus.find(params[:new_status_id])
+
-    if params[:confirm]
+  def change_status
-      begin
+    #@history = @issue.histories.build(params[:history])	
-        journal = @issue.init_journal(self.logged_in_user, params[:notes])
+    @status_options = @issue.status.workflows.find(:all, :order => 'position', :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
-        @issue.status = @new_status
+    @new_status = IssueStatus.find(params[:new_status_id])
-        if @issue.update_attributes(params[:issue])
+    if params[:confirm]
-          # Save attachments
+      begin
-          params[:attachments].each { |file|
+        #@history.author_id = self.logged_in_user.id if self.logged_in_user
-            next unless file.size > 0
+        #@issue.status = @history.status
-            a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)            
+        #@issue.fixed_version_id = (params[:issue][:fixed_version_id])
-            journal.details << JournalDetail.new(:property => 'attachment',
+        #@issue.assigned_to_id = (params[:issue][:assigned_to_id])
-                                                 :prop_key => a.id,
+        #@issue.done_ratio = (params[:issue][:done_ratio])
-                                                 :value => a.filename) unless a.new_record?
+        #@issue.lock_version = (params[:issue][:lock_version])
-          } if params[:attachments] and params[:attachments].is_a? Array
+        journal = @issue.init_journal(self.logged_in_user, params[:notes])
-        
+        @issue.status = @new_status
-          # Log time
+        if @issue.update_attributes(params[:issue])
-          if logged_in_user.authorized_to(@project, "timelog/edit")
+          flash[:notice] = l(:notice_successful_update)
-            @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => logged_in_user, :spent_on => Date.today)
+          Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-            @time_entry.attributes = params[:time_entry]
+          redirect_to :action => 'show', :id => @issue
-            @time_entry.save
+        end
-          end
+      rescue ActiveRecord::StaleObjectError
-          
+        # Optimistic locking exception
-          flash[:notice] = l(:notice_successful_update)
+        flash[:notice] = l(:notice_locking_conflict)
-          Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
+      end
-          redirect_to :action => 'show', :id => @issue
+    end    
-        end
+    @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
-      rescue ActiveRecord::StaleObjectError
-        # Optimistic locking exception
-        flash[:notice] = l(:notice_locking_conflict)
-      end
-    end    
-    @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
-    @activities = Enumeration::get_values('ACTI')
   end
 
   def destroy
     @issue.destroy
     redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
-  end
+  end
-
+
-  def add_attachment
+  def add_attachment
-    # Save the attachments
+    # Save the attachments
-    @attachments = []
+    @attachments = []
-    journal = @issue.init_journal(self.logged_in_user)
+    params[:attachments].each { |file|
-    params[:attachments].each { |file|
+      next unless file.size > 0
-      next unless file.size > 0
+      a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
-      a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
+      @attachments << a unless a.new_record?
-      @attachments << a unless a.new_record?
+    } if params[:attachments] and params[:attachments].is_a? Array
-      journal.details << JournalDetail.new(:property => 'attachment',
+    Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-                                           :prop_key => a.id,
+    redirect_to :action => 'show', :id => @issue
-                                           :value => a.filename) unless a.new_record?
+  end
-    } if params[:attachments] and params[:attachments].is_a? Array
+
-    journal.save if journal.details.any?
+  def destroy_attachment
-    Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
+    @issue.attachments.find(params[:attachment_id]).destroy
-    redirect_to :action => 'show', :id => @issue
+    redirect_to :action => 'show', :id => @issue
-  end
+  end
-
+
-  def destroy_attachment
+  # Send the file in stream mode
-    a = @issue.attachments.find(params[:attachment_id])
+  def download
-    a.destroy
+    @attachment = @issue.attachments.find(params[:attachment_id])
-    journal = @issue.init_journal(self.logged_in_user)
+    send_file @attachment.diskfile, :filename => @attachment.filename
-    journal.details << JournalDetail.new(:property => 'attachment',
+  rescue
-                                         :prop_key => a.id,
+    render_404
-                                         :old_value => a.filename)
+  end
-    journal.save
+
-    redirect_to :action => 'show', :id => @issue
+private
-  end
+  def find_project
-
+    @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
-private
+    @project = @issue.project
-  def find_project
+    @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
-    @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
+  rescue ActiveRecord::RecordNotFound
-    @project = @issue.project
+    render_404
-    @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
-  rescue ActiveRecord::RecordNotFound
-    render_404
   end  
 end

app/controllers/members_controller.rb

@@ -1,46 +1,42 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 class MembersController < ApplicationController
-  layout 'base'
+  layout 'base'
-  before_filter :find_project, :authorize
+  before_filter :find_project, :authorize
 
   def edit
-    if request.post? and @member.update_attributes(params[:member])
+    if request.post? and @member.update_attributes(params[:member])
-  	 respond_to do |format|
+      flash[:notice] = l(:notice_successful_update)
-        format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+      redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
-        format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/members'} }
-      end
     end
   end
-
+
   def destroy
-    @member.destroy
+    @member.destroy
-	respond_to do |format|
+    flash[:notice] = l(:notice_successful_delete)
-      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
-      format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/members'} }
+  end
-    end
+
-  end
+private
-
+  def find_project
-private
+    @member = Member.find(params[:id]) 
-  def find_project
+    @project = @member.project
-    @member = Member.find(params[:id]) 
+  rescue ActiveRecord::RecordNotFound
-    @project = @member.project
+    render_404
-  rescue ActiveRecord::RecordNotFound
-    render_404
   end
 end

app/controllers/messages_controller.rb

@@ -1,62 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class MessagesController < ApplicationController
-  layout 'base'
-  before_filter :find_project, :check_project_privacy
-  before_filter :require_login, :only => [:new, :reply]
-
-  verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
-
-  helper :attachments
-  include AttachmentsHelper   
-
-  def show
-    @reply = Message.new(:subject => "RE: #{@message.subject}")
-    render :action => "show", :layout => false if request.xhr?
-  end
-  
-  def new
-    @message = Message.new(params[:message])
-    @message.author = logged_in_user
-    @message.board = @board 
-    if request.post? && @message.save
-      params[:attachments].each { |file|
-        next unless file.size > 0
-        Attachment.create(:container => @message, :file => file, :author => logged_in_user)
-      } if params[:attachments] and params[:attachments].is_a? Array    
-      redirect_to :action => 'show', :id => @message
-    end
-  end
-
-  def reply
-    @reply = Message.new(params[:reply])
-    @reply.author = logged_in_user
-    @reply.board = @board
-    @message.children << @reply
-    redirect_to :action => 'show', :id => @message
-  end
-  
-private
-  def find_project
-    @board = Board.find(params[:board_id], :include => :project)
-    @project = @board.project
-    @message = @board.topics.find(params[:id]) if params[:id]
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/my_controller.rb

@@ -21,7 +21,6 @@ class MyController < ApplicationController
 
   BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
              'issuesreportedbyme' => :label_reported_issues,
-             'issueswatched' => :label_watched_issues,
              'news' => :label_news_latest,
              'calendar' => :label_calendar,
              'documents' => :label_document_plural
@@ -91,9 +90,8 @@ class MyController < ApplicationController
   # The block is added on top of the page
   # params[:block] : id of the block to add
   def add_block
-    block = params[:block]
-    render(:nothing => true) and return unless block && (BLOCKS.keys.include? block)
     @user = self.logged_in_user
+    block = params[:block]
     # remove if already present in a group
     %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
     # add it on top

app/controllers/news_controller.rb

@@ -1,23 +1,23 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class NewsController < ApplicationController
+class NewsController < ApplicationController
-  layout 'base'
+  layout 'base'
-  before_filter :find_project, :authorize
+  before_filter :find_project, :authorize
 
   def show
   end
@@ -27,34 +27,34 @@ class NewsController < ApplicationController
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'show', :id => @news
     end
+  end
+  
+  def add_comment
+    @comment = Comment.new(params[:comment])
+    @comment.author = logged_in_user
+    if @news.comments << @comment
+      flash[:notice] = l(:label_comment_added)
+      redirect_to :action => 'show', :id => @news
+    else
+      render :action => 'show'
+    end
   end
-  
+
-  def add_comment
+  def destroy_comment
-    @comment = Comment.new(params[:comment])
+    @news.comments.find(params[:comment_id]).destroy
-    @comment.author = logged_in_user
+    redirect_to :action => 'show', :id => @news
-    if @news.comments << @comment
+  end
-      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 :controller => 'projects', :action => 'list_news', :id => @project
-  end
+  end
-  
+  
-private
+private
-  def find_project
+  def find_project
-    @news = News.find(params[:id])
+    @news = News.find(params[:id])
-    @project = @news.project
+    @project = @news.project
-  rescue ActiveRecord::RecordNotFound
+  rescue ActiveRecord::RecordNotFound
-    render_404
+    render_404
   end  
 end

app/controllers/queries_controller.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  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,35 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class QueriesController < ApplicationController
-  layout 'base'  
+  layout 'base'
-  before_filter :require_login, :except => :index
+  before_filter :require_login, :find_query
-  before_filter :find_project, :check_project_privacy
 
-  def index
-    @queries = @project.queries.find(:all, 
-                                     :order => "name ASC",
-                                     :conditions => ["is_public = ? or user_id = ?", true, (logged_in_user ? logged_in_user.id : 0)])
-  end
-  
-  def new
-    @query = Query.new(params[:query])
-    @query.project = @project
-    @query.user = logged_in_user
-    @query.executed_by = logged_in_user
-    @query.is_public = false unless logged_in_user.authorized_to(@project, 'projects/add_query')
-    
-    params[:fields].each do |field|
-      @query.add_filter(field, params[:operators][field], params[:values][field])
-    end if params[:fields]
-    
-    if request.post? and @query.save
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
-      return
-    end
-    render :layout => false if request.xhr?
-  end
-  
   def edit
     if request.post?
       @query.filters = {}
@@ -52,7 +26,6 @@ class QueriesController < ApplicationController
         @query.add_filter(field, params[:operators][field], params[:values][field])
       end if params[:fields]
       @query.attributes = params[:query]
-      @query.is_public = false unless logged_in_user.authorized_to(@project, 'projects/add_query')
           
       if @query.save
         flash[:notice] = l(:notice_successful_update)
@@ -63,19 +36,15 @@ class QueriesController < ApplicationController
 
   def destroy
     @query.destroy if request.post?
-    redirect_to :controller => 'queries', :project_id => @project
+    redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
   end
   
 private
-  def find_project
+  def find_query
-    if params[:id]
+    @query = Query.find(params[:id])
-      @query = Query.find(params[:id])
+    @project = @query.project
-      @query.executed_by = logged_in_user
+    # check if user is allowed to manage queries (same permission as add_query)
-      @project = @query.project
+    authorize('projects', 'add_query')
-      render_403 unless @query.editable_by?(logged_in_user)
-    else
-      @project = Project.find(params[:project_id])
-    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end

app/controllers/reports_controller.rb

@@ -1,213 +1,167 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class ReportsController < ApplicationController
+class ReportsController < ApplicationController
-  layout 'base'
+  layout 'base'
-  before_filter :find_project, :authorize
+  before_filter :find_project, :authorize
-
+
-  def issue_report
+  def issue_report
-    @statuses = IssueStatus.find(:all, :order => 'position')
+    @statuses = IssueStatus.find(:all, :order => 'position')
-    
+    
-    case params[:detail]
+    case params[:detail]
-    when "tracker"
+    when "tracker"
-      @field = "tracker_id"
+      @field = "tracker_id"
-      @rows = Tracker.find :all, :order => 'position'
+      @rows = Tracker.find :all, :order => 'position'
-      @data = issues_by_tracker
+      @data = issues_by_tracker
-      @report_title = l(:field_tracker)
+      @report_title = l(:field_tracker)
-      render :template => "reports/issue_report_details"
+      render :template => "reports/issue_report_details"
-    when "version"
+    when "priority"
-      @field = "fixed_version_id"
+      @field = "priority_id"
-      @rows = @project.versions.sort
+      @rows = Enumeration::get_values('IPRI')
-      @data = issues_by_version
+      @data = issues_by_priority
-      @report_title = l(:field_version)
+      @report_title = l(:field_priority)
-      render :template => "reports/issue_report_details"
+      render :template => "reports/issue_report_details"   
-    when "priority"
+    when "category"
-      @field = "priority_id"
+      @field = "category_id"
-      @rows = Enumeration::get_values('IPRI')
+      @rows = @project.issue_categories
-      @data = issues_by_priority
+      @data = issues_by_category
-      @report_title = l(:field_priority)
+      @report_title = l(:field_category)
-      render :template => "reports/issue_report_details"   
+      render :template => "reports/issue_report_details"   
-    when "category"
+    when "author"
-      @field = "category_id"
+      @field = "author_id"
-      @rows = @project.issue_categories
+      @rows = @project.members.collect { |m| m.user }
-      @data = issues_by_category
+      @data = issues_by_author
-      @report_title = l(:field_category)
+      @report_title = l(:field_author)
-      render :template => "reports/issue_report_details"   
+      render :template => "reports/issue_report_details"  
-    when "author"
+    else
-      @field = "author_id"
+      @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
-      @rows = @project.members.collect { |m| m.user }
+      @trackers = Tracker.find(:all, :order => 'position')
-      @data = issues_by_author
+      @priorities = Enumeration::get_values('IPRI')
-      @report_title = l(:field_author)
+      @categories = @project.issue_categories
-      render :template => "reports/issue_report_details"  
+      @authors = @project.members.collect { |m| m.user }
-    when "subproject"
+      issues_by_tracker
-      @field = "project_id"
+      issues_by_priority
-      @rows = @project.active_children
+      issues_by_category
-      @data = issues_by_subproject
+      issues_by_author
-      @report_title = l(:field_subproject)
+      render :template => "reports/issue_report"
-      render :template => "reports/issue_report_details"  
+    end
-    else
+  end  
-      @trackers = Tracker.find(:all, :order => 'position')
+  
-      @versions = @project.versions.sort
+  def delays
-      @priorities = Enumeration::get_values('IPRI')
+    @trackers = Tracker.find(:all)
-      @categories = @project.issue_categories
+    if request.get?
-      @authors = @project.members.collect { |m| m.user }
+      @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
-      @subprojects = @project.active_children
+    else
-      issues_by_tracker
+      @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
-      issues_by_version
+    end
-      issues_by_priority
+    @selected_tracker_ids ||= []    
-      issues_by_category
+    @raw = 
-      issues_by_author
+      ActiveRecord::Base.connection.select_all("SELECT datediff( a.created_on, b.created_on ) as delay, count(a.id) as total
-      issues_by_subproject
+      FROM issue_histories a, issue_histories b, issues i
-      @total_hours = @project.time_entries.sum(:hours)
+      WHERE a.status_id =5
-      render :template => "reports/issue_report"
+      AND a.issue_id = b.issue_id
-    end
+      AND a.issue_id = i.id
-  end  
+      AND i.tracker_id in (#{@selected_tracker_ids.join(',')})
-  
+      AND b.id = (
-  def delays
+      SELECT min( c.id )
-    @trackers = Tracker.find(:all)
+      FROM issue_histories c
-    if request.get?
+      WHERE b.issue_id = c.issue_id ) 
-      @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
+      GROUP BY delay") unless @selected_tracker_ids.empty?    
-    else
+    @raw ||=[]
-      @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
+    @x_from = 0
-    @selected_tracker_ids ||= []    
+    @x_to = 0
-    @raw = 
+    @y_from = 0
-      ActiveRecord::Base.connection.select_all("SELECT datediff( a.created_on, b.created_on ) as delay, count(a.id) as total
+    @y_to = 0
-      FROM issue_histories a, issue_histories b, issues i
+    @sum_total = 0
-      WHERE a.status_id =5
+    @sum_delay = 0
-      AND a.issue_id = b.issue_id
+    @raw.each do |r|
-      AND a.issue_id = i.id
+      @x_to = [r['delay'].to_i, @x_to].max
-      AND i.tracker_id in (#{@selected_tracker_ids.join(',')})
+      @y_to = [r['total'].to_i, @y_to].max
-      AND b.id = (
+      @sum_total = @sum_total + r['total'].to_i
-      SELECT min( c.id )
+      @sum_delay = @sum_delay + r['total'].to_i * r['delay'].to_i
-      FROM issue_histories c
+    end    
-      WHERE b.issue_id = c.issue_id ) 
+  end
-      GROUP BY delay") unless @selected_tracker_ids.empty?    
+  
-    @raw ||=[]
+private
-    
+  # Find project of id params[:id]
-    @x_from = 0
+  def find_project
-    @x_to = 0
+    @project = Project.find(params[:id])		
-    @y_from = 0
+  rescue ActiveRecord::RecordNotFound
-    @y_to = 0
+    render_404
-    @sum_total = 0
+  end
-    @sum_delay = 0
+
-    @raw.each do |r|
+  def issues_by_tracker
-      @x_to = [r['delay'].to_i, @x_to].max
+    @issues_by_tracker ||= 
-      @y_to = [r['total'].to_i, @y_to].max
+        ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
-      @sum_total = @sum_total + r['total'].to_i
+                                                  s.is_closed as closed, 
-      @sum_delay = @sum_delay + r['total'].to_i * r['delay'].to_i
+                                                  t.id as tracker_id,
-    end    
+                                                  count(i.id) as total 
-  end
+                                                from 
-  
+                                                  issues i, issue_statuses s, trackers t
-private
+                                                where 
-  # Find project of id params[:id]
+                                                  i.status_id=s.id 
-  def find_project
+                                                  and i.tracker_id=t.id
-    @project = Project.find(params[:id])		
+                                                  and i.project_id=#{@project.id}
-  rescue ActiveRecord::RecordNotFound
+                                                group by s.id, s.is_closed, t.id")	
-    render_404
+  end
-  end
+	
-
+  def issues_by_priority    
-  def issues_by_tracker
+    @issues_by_priority ||= 
-    @issues_by_tracker ||= 
+      ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
-        ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
+                                                  s.is_closed as closed, 
-                                                  s.is_closed as closed, 
+                                                  p.id as priority_id,
-                                                  t.id as tracker_id,
+                                                  count(i.id) as total 
-                                                  count(i.id) as total 
+                                                from 
-                                                from 
+                                                  issues i, issue_statuses s, enumerations p
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Tracker.table_name} t
+                                                where 
-                                                where 
+                                                  i.status_id=s.id 
-                                                  i.status_id=s.id 
+                                                  and i.priority_id=p.id
-                                                  and i.tracker_id=t.id
+                                                  and i.project_id=#{@project.id}
-                                                  and i.project_id=#{@project.id}
+                                                group by s.id, s.is_closed, p.id")	
-                                                group by s.id, s.is_closed, t.id")	
+  end
-  end
+	
-
+  def issues_by_category   
-  def issues_by_version
+    @issues_by_category ||= 
-    @issues_by_version ||= 
+      ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
-        ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
+                                                  s.is_closed as closed, 
-                                                  s.is_closed as closed, 
+                                                  c.id as category_id,
-                                                  v.id as fixed_version_id,
+                                                  count(i.id) as total 
-                                                  count(i.id) as total 
+                                                from 
-                                                from 
+                                                  issues i, issue_statuses s, issue_categories c
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Version.table_name} v
+                                                where 
-                                                where 
+                                                  i.status_id=s.id 
-                                                  i.status_id=s.id 
+                                                  and i.category_id=c.id
-                                                  and i.fixed_version_id=v.id
+                                                  and i.project_id=#{@project.id}
-                                                  and i.project_id=#{@project.id}
+                                                group by s.id, s.is_closed, c.id")	
-                                                group by s.id, s.is_closed, v.id")	
+  end
-  end
+	
-  	
+  def issues_by_author
-  def issues_by_priority    
+    @issues_by_author ||= 
-    @issues_by_priority ||= 
+      ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
-      ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
+                                                  s.is_closed as closed, 
-                                                  s.is_closed as closed, 
+                                                  a.id as author_id,
-                                                  p.id as priority_id,
+                                                  count(i.id) as total 
-                                                  count(i.id) as total 
+                                                from 
-                                                from 
+                                                  issues i, issue_statuses s, users a
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Enumeration.table_name} p
+                                                where 
-                                                where 
+                                                  i.status_id=s.id 
-                                                  i.status_id=s.id 
+                                                  and i.author_id=a.id
-                                                  and i.priority_id=p.id
+                                                  and i.project_id=#{@project.id}
-                                                  and i.project_id=#{@project.id}
+                                                group by s.id, s.is_closed, a.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_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
-# Copyright (C) 2006-2007  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,114 +15,54 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'SVG/Graph/Bar'
-require 'SVG/Graph/BarHorizontal'
-require 'digest/sha1'
-
 class RepositoriesController < ApplicationController
   layout 'base'
-  before_filter :find_project, :except => [:update_form]
+  before_filter :find_project, :authorize
-  before_filter :authorize, :except => [:update_form, :stats, :graph]
+
-  before_filter :check_project_privacy, :only => [:stats, :graph]
-  
   def show
-    # check if new revisions have been committed in the repository
+    @entries = @repository.scm.entries('')
-    @repository.fetch_changesets if Setting.autofetch_changesets?
+    show_error and return unless @entries
-    # get entries for the browse frame
+    @latest_revision = @entries.revisions.latest
-    @entries = @repository.entries('')    
-    # latest changesets
-    @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
-    show_error and return unless @entries || @changesets.any?
   end
   
   def browse
-    @entries = @repository.entries(@path, @rev)
+    @entries = @repository.scm.entries(@path, @rev)
-    show_error and return unless @entries    
+    show_error and return unless @entries
-  end
-  
-  def changes
-    @entry = @repository.scm.entry(@path, @rev)
-    show_error and return unless @entry
-    @changes = Change.find(:all, :include => :changeset, 
-                                 :conditions => ["repository_id = ? AND path = ?", @repository.id, @path.with_leading_slash],
-                                 :order => "committed_on DESC")
   end
   
   def revisions
-    @changeset_count = @repository.changesets.count
+    @entry = @repository.scm.entry(@path, @rev)
-    @changeset_pages = Paginator.new self, @changeset_count,
+    @revisions = @repository.scm.revisions(@path, @rev)
-								      25,
+    show_error and return unless @entry && @revisions
-								      params['page']								
-    @changesets = @repository.changesets.find(:all,
-						:limit  =>  @changeset_pages.items_per_page,
-						:offset =>  @changeset_pages.current.offset)
-
-    render :action => "revisions", :layout => false if request.xhr?
   end
   
   def entry
-    @content = @repository.scm.cat(@path, @rev)
+    if 'raw' == params[:format]
-    show_error and return unless @content
+      content = @repository.scm.cat(@path, @rev)
-    if 'raw' == params[:format]      
+      show_error and return unless content
-      send_data @content, :filename => @path.split('/').last
+      send_data content, :filename => @path.split('/').last
     end
   end
   
   def revision
-    @changeset = @repository.changesets.find_by_revision(@rev)
+    @revisions = @repository.scm.revisions '', @rev, @rev, :with_paths => true
-    show_error and return unless @changeset
+    show_error and return unless @revisions
-    @changes_count = @changeset.changes.size
+    @revision = @revisions.first  
-    @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)
-  	
-  	render :action => "revision", :layout => false if request.xhr?	
   end
   
   def diff
-    @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1)
+    @rev_to = params[:rev_to] || (@rev-1)
-    @diff_type = ('sbs' == params[:type]) ? 'sbs' : 'inline'
+    @diff = @repository.scm.diff(params[:path], @rev, @rev_to)
-    
+    show_error and return unless @diff
-    @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, type)
-      show_error and return unless @diff
-    end
-  end
-  
-  def stats  
-  end
-  
-  def graph
-    data = nil    
-    case params[:graph]
-    when "commits_per_month"
-      data = graph_commits_per_month(@repository)
-    when "commits_per_author"
-      data = graph_commits_per_author(@repository)
-    end
-    if data
-      headers["Content-Type"] = "image/svg+xml"
-      send_data(data, :type => "image/svg+xml", :disposition => "inline")
-    else
-      render_404
-    end
-  end
-  
-  def update_form
-    @repository = Repository.factory(params[:repository_scm])
-    render :partial => 'projects/repository', :locals => {:repository => @repository}
   end
   
 private
   def find_project
     @project = Project.find(params[:id])
     @repository = @project.repository
-    render_404 and return false unless @repository
+    @path = params[:path].squeeze('/').gsub(/^\//, '') if params[:path]
-    @path = params[:path].squeeze('/') if params[:path]
     @path ||= ''
-    @rev = params[:rev].to_i if params[:rev]
+    @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
   rescue ActiveRecord::RecordNotFound
     render_404
   end
@@ -131,101 +71,4 @@ private
     flash.now[:notice] = l(:notice_scm_error)
     render :nothing => true, :layout => true
   end
-  
-  def graph_commits_per_month(repository)
-    @date_to = Date.today
-    @date_from = @date_to << 12
-    commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
-    commits_by_month = [0] * 12
-    commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
-
-    changes_by_day = repository.changes.count(:all, :group => :commit_date)
-    changes_by_month = [0] * 12
-    changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
-   
-    fields = []
-    month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
-    12.times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
-  
-    graph = SVG::Graph::Bar.new(
-      :height => 300,
-      :width => 500,
-      :fields => fields.reverse,
-      :stack => :side,
-      :scale_integers => true,
-      :step_x_labels => 2,
-      :show_data_values => false,
-      :graph_title => l(:label_commits_per_month),
-      :show_graph_title => true
-    )
-    
-    graph.add_data(
-      :data => commits_by_month[0..11].reverse,
-      :title => l(:label_revision_plural)
-    )
-
-    graph.add_data(
-      :data => changes_by_month[0..11].reverse,
-      :title => l(:label_change_plural)
-    )
-    
-    graph.burn
-  end
-
-  def graph_commits_per_author(repository)
-    commits_by_author = repository.changesets.count(:all, :group => :committer)
-    commits_by_author.sort! {|x, y| x.last <=> y.last}
-
-    changes_by_author = repository.changes.count(:all, :group => :committer)
-    h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
-    
-    fields = commits_by_author.collect {|r| r.first}
-    commits_data = commits_by_author.collect {|r| r.last}
-    changes_data = commits_by_author.collect {|r| h[r.first] || 0}
-    
-    fields = fields + [""]*(10 - fields.length) if fields.length<10
-    commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
-    changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
-    
-    graph = SVG::Graph::BarHorizontal.new(
-      :height => 300,
-      :width => 500,
-      :fields => fields,
-      :stack => :side,
-      :scale_integers => true,
-      :show_data_values => false,
-      :rotate_y_labels => false,
-      :graph_title => l(:label_commits_per_author),
-      :show_graph_title => true
-    )
-    
-    graph.add_data(
-      :data => commits_data,
-      :title => l(:label_revision_plural)
-    )
-
-    graph.add_data(
-      :data => changes_data,
-      :title => l(:label_change_plural)
-    )
-       
-    graph.burn
-  end
-
-end
-  
-class Date
-  def months_ago(date = Date.today)
-    (date.year - self.year)*12 + (date.month - self.month)
-  end
-
-  def weeks_ago(date = Date.today)
-    (date.year - self.year)*52 + (date.cweek - self.cweek)
-  end
-end
-
-class String
-  def with_leading_slash
-    starts_with?('/') ? self : "/#{self}"
-  end
 end

app/controllers/roles_controller.rb

@@ -1,26 +1,26 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class RolesController < ApplicationController
+class RolesController < ApplicationController
-  layout 'base'	
+  layout 'base'	
-  before_filter :require_admin
+  before_filter :require_admin
-
+
-  verify :method => :post, :only => [ :destroy, :move ],
+  verify :method => :post, :only => [ :destroy, :move ],
-         :redirect_to => { :action => :list }
+         :redirect_to => { :action => :list }
 
   def index
     list
@@ -28,26 +28,26 @@ class RolesController < ApplicationController
   end
 
   def list
-    @role_pages, @roles = paginate :roles, :per_page => 25, :order => "position"
+    @role_pages, @roles = paginate :roles, :per_page => 10, :order => "position"
     render :action => "list", :layout => false if request.xhr?
   end
 
   def new
-    @role = Role.new(params[:role])
+    @role = Role.new(params[:role])
     if request.post?
       @role.permissions = Permission.find(params[:permission_ids]) if params[:permission_ids]
       if @role.save
         flash[:notice] = l(:notice_successful_create)
         redirect_to :action => 'list'
-      end
+      end
     end
     @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
   end
 
   def edit
-    @role = Role.find(params[:id])
+    @role = Role.find(params[:id])
     if request.post? and @role.update_attributes(params[:role])
-      @role.permissions = Permission.find(params[:permission_ids] || [])
+      @role.permissions = Permission.find(params[:permission_ids] || [])
       Permission.allowed_to_role_expired
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'list'
@@ -56,60 +56,47 @@ class RolesController < ApplicationController
   end
 
   def destroy
-    @role = Role.find(params[:id])
+    @role = Role.find(params[:id])
-    unless @role.members.empty?
+    unless @role.members.empty?
-      flash[:notice] = 'Some members have this role. Can\'t delete it.'
+      flash[:notice] = 'Some members have this role. Can\'t delete it.'
-    else
+    else
-      @role.destroy
+      @role.destroy
     end
     redirect_to :action => 'list'
-  end
+  end
-  
+  
-  def move
+  def move
-    @role = Role.find(params[:id])
+    @role = Role.find(params[:id])
-    case params[:position]
+    case params[:position]
-    when 'highest'
+    when 'highest'
-      @role.move_to_top
+      @role.move_to_top
-    when 'higher'
+    when 'higher'
-      @role.move_higher
+      @role.move_higher
-    when 'lower'
+    when 'lower'
-      @role.move_lower
+      @role.move_lower
-    when 'lowest'
+    when 'lowest'
-      @role.move_to_bottom
+      @role.move_to_bottom
-    end if params[:position]
+    end if params[:position]
-    redirect_to :action => 'list'
+    redirect_to :action => 'list'
-  end
+  end
-  
+  
-  def workflow    
+  def workflow    
-    @role = Role.find_by_id(params[:role_id])
+    @role = Role.find_by_id(params[:role_id])
-    @tracker = Tracker.find_by_id(params[:tracker_id])    
+    @tracker = Tracker.find_by_id(params[:tracker_id])    
-    
+    
-    if request.post?
+    if request.post?
-      Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
+      Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
-      (params[:issue_status] || []).each { |old, news| 
+      (params[:issue_status] || []).each { |old, news| 
-        news.each { |new| 
+        news.each { |new| 
-          @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new) 
+          @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new) 
-        }
+        }
-      }
+      }
-      if @role.save
+      if @role.save
-        flash[:notice] = l(:notice_successful_update)
+        flash[:notice] = l(:notice_successful_update)
-      end
+      end
-    end
+    end
-    @roles = Role.find(:all, :order => 'position')
+    @roles = Role.find(:all, :order => 'position')
-    @trackers = Tracker.find(:all, :order => 'position')
+    @trackers = Tracker.find(:all, :order => 'position')
-    @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')
+    @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')
-  end
-  
-  def report    
-    @roles = Role.find(:all, :order => 'position')
-    @permissions = Permission.find :all, :conditions => ["is_public=?", false], :order => 'sort'
-    if request.post?
-      @roles.each do |role|
-        role.permissions = Permission.find(params[:permission_ids] ? (params[:permission_ids][role.id.to_s] || []) : [] )
-      end
-      Permission.allowed_to_role_expired
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'list'
-    end
   end
 end

app/controllers/search_controller.rb

@@ -1,81 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class SearchController < ApplicationController
-  layout 'base'
-
-  helper :messages
-  include MessagesHelper
-
-  def index
-    @question = params[:q] || ""
-    @question.strip!
-    @all_words = params[:all_words] || (params[:submit] ? false : true)
-    @scope = params[:scope] || (params[:submit] ? [] : %w(projects issues changesets news documents wiki messages) )
-    
-    # quick jump to an issue
-    if @scope.include?('issues') && @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(logged_in_user))
-      redirect_to :controller => "issues", :action => "show", :id => $1
-      return
-    end
-    
-    if params[:id]
-      find_project
-      return unless check_project_privacy
-    end
-    
-    # tokens must be at least 3 character long
-    @tokens = @question.split.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}%"}
-      operator = @all_words ? " AND " : " OR "
-      limit = 10
-      @results = []
-      if @project
-        @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(subject) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'
-        @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'
-        @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'
-        @results += @project.wiki.pages.find(:all, :limit => limit, :include => :content, :conditions => [ (["(LOWER(title) like ? OR LOWER(text) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @project.wiki && @scope.include?('wiki')
-        @results += @project.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comments) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
-        Message.with_scope :find => {:conditions => ["#{Board.table_name}.project_id = ?", @project.id]} do
-          @results += Message.find(:all, :include => :board, :limit => limit, :conditions => [ (["(LOWER(subject) like ? OR LOWER(content) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'messages'
-        end
-      else
-        Project.with_scope(:find => {:conditions => Project.visible_by(logged_in_user)}) do
-          @results += Project.find(:all, :limit => limit, :conditions => [ (["(LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'projects'
-        end
-        # if only one project is found, user is redirected to its overview
-        redirect_to :controller => 'projects', :action => 'show', :id => @results.first and return if @results.size == 1
-      end
-      @question = @tokens.join(" ")
-    else
-      @question = ""
-    end
-  end
-
-private  
-  def find_project
-    @project = Project.find(params[:id])
-    @html_title = @project.name
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/settings_controller.rb

@@ -29,6 +29,5 @@ class SettingsController < ApplicationController
       params[:settings].each { |name, value| Setting[name] = value }
       redirect_to :action => 'edit' and return
     end
-    @textile_available = ActionView::Helpers::TextHelper.method_defined?("textilize")
   end
 end

app/controllers/sys_controller.rb

@@ -1,44 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class SysController < ActionController::Base
-  wsdl_service_name 'Sys'
-  web_service_api SysApi
-  web_service_scaffold :invoke
-  
-  before_invocation :check_enabled
-  
-  def projects
-    Project.find(:all, :include => :repository)
-  end
-
-  def repository_created(project_id, url)
-    project = Project.find_by_id(project_id)
-    return 0 unless project && project.repository.nil?
-    logger.debug "Repository for #{project.name} created"
-    repository = Repository.new(:project => project, :url => url)
-    repository.root_url = url
-    repository.save
-    repository.id
-  end
-
-protected
-
-  def check_enabled(name, args)
-    Setting.sys_api_enabled?
-  end
-end

app/controllers/timelog_controller.rb

@@ -1,174 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class TimelogController < ApplicationController
-  layout 'base'
-  
-  before_filter :find_project
-  before_filter :authorize, :only => :edit
-  before_filter :check_project_privacy, :except => :edit
-
-  helper :sort
-  include SortHelper
-  
-  def report
-    @available_criterias = { 'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
-                                          :values => @project.versions,
-                                          :label => :label_version},
-                             'category' => {:sql => "#{Issue.table_name}.category_id",
-                                            :values => @project.issue_categories,
-                                            :label => :field_category},
-                             'member' => {:sql => "#{TimeEntry.table_name}.user_id",
-                                         :values => @project.users,
-                                         :label => :label_member},
-                             'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
-                                          :values => Tracker.find(:all),
-                                          :label => :label_tracker},
-                             'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
-                                           :values => Enumeration::get_values('ACTI'),
-                                           :label => :label_activity}
-                           }
-    
-    @criterias = params[:criterias] || []
-    @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
-    @criterias.uniq!
-    
-    @columns = (params[:period] && %w(year month week).include?(params[:period])) ? params[:period] : 'month'
-    
-    if params[:date_from]
-      begin; @date_from = params[:date_from].to_date; rescue; end
-    end
-    if params[:date_to]
-      begin; @date_to = params[:date_to].to_date; rescue; end
-    end
-    @date_from ||= Date.civil(Date.today.year, 1, 1)
-    @date_to ||= Date.civil(Date.today.year, Date.today.month+1, 1) - 1
-    
-    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, SUM(hours) AS hours"
-      sql << " FROM #{TimeEntry.table_name} LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
-      sql << " WHERE #{TimeEntry.table_name}.project_id = %s" % @project.id
-      sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@date_from.to_time), ActiveRecord::Base.connection.quoted_date(@date_to.to_time)]
-      sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek"
-      
-      @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']}"
-        end
-      end
-    end
-       
-    @periods = []
-    date_from = @date_from
-    # 100 columns max
-    while date_from < @date_to && @periods.length < 100
-      case @columns
-      when 'year'
-        @periods << "#{date_from.year}"
-        date_from = date_from >> 12
-      when 'month'
-        @periods << "#{date_from.year}-#{date_from.month}"
-        date_from = date_from >> 1
-      when 'week'
-        @periods << "#{date_from.year}-#{date_from.cweek}"
-        date_from = date_from + 7
-      end
-    end
-    
-    render :layout => false if request.xhr?
-  end
-  
-  def details
-    sort_init 'spent_on', 'desc'
-    sort_update
-    
-    @entries = (@issue ? @issue : @project).time_entries.find(:all, :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}], :order => sort_clause)
-
-    @total_hours = @entries.inject(0) { |sum,entry| sum + entry.hours }
-    @owner_id = logged_in_user ? logged_in_user.id : 0
-    
-    send_csv and return if 'csv' == params[:export]    
-    render :action => 'details', :layout => false if request.xhr?
-  end
-  
-  def edit
-    render_404 and return if @time_entry && @time_entry.user != logged_in_user
-    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => logged_in_user, :spent_on => Date.today)
-    @time_entry.attributes = params[:time_entry]
-    if request.post? and @time_entry.save
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'details', :project_id => @time_entry.project, :issue_id => @time_entry.issue
-      return
-    end    
-    @activities = Enumeration::get_values('ACTI')
-  end
-
-private
-  def find_project
-    if params[:id]
-      @time_entry = TimeEntry.find(params[:id])
-      @project = @time_entry.project
-    elsif params[:issue_id]
-      @issue = Issue.find(params[:issue_id])
-      @project = @issue.project
-    elsif params[:project_id]
-      @project = Project.find(params[:project_id])
-    else
-      render_404
-      return false
-    end
-  end
-  
-  def send_csv
-    ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
-    export = StringIO.new
-    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
-      # csv header fields
-      headers = [l(:field_spent_on),
-                 l(:field_user),
-                 l(:field_activity),
-                 l(:field_issue),
-                 l(:field_hours),
-                 l(:field_comments)
-                 ]
-      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
-      # csv lines
-      @entries.each do |entry|
-        fields = [l_date(entry.spent_on),
-                  entry.user.name,
-                  entry.activity.name,
-                  (entry.issue ? entry.issue.id : nil),
-                  entry.hours,
-                  entry.comments
-                  ]
-        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
-      end
-    end
-    export.rewind
-    send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
-  end
-end

app/controllers/trackers_controller.rb

@@ -1,23 +1,23 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class TrackersController < ApplicationController
+class TrackersController < ApplicationController
-  layout 'base'
+  layout 'base'
-  before_filter :require_admin
+  before_filter :require_admin
 
   def index
     list
@@ -28,23 +28,16 @@ class TrackersController < ApplicationController
   verify :method => :post, :only => [ :destroy, :move ], :redirect_to => { :action => :list }
 
   def list
-    @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
+    @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
     render :action => "list", :layout => false if request.xhr?
   end
 
   def new
     @tracker = Tracker.new(params[:tracker])
     if request.post? and @tracker.save
-      # workflow copy
-      if params[:copy_workflow_from] && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
-        copy_from.workflows.each do |w|
-          @tracker.workflows << w.clone
-        end
-      end
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'list'
     end
-    @trackers = Tracker.find :all
   end
 
   def edit
@@ -54,28 +47,28 @@ class TrackersController < ApplicationController
       redirect_to :action => 'list'
     end
   end
-
+
-  def move
+  def move
-    @tracker = Tracker.find(params[:id])
+    @tracker = Tracker.find(params[:id])
-    case params[:position]
+    case params[:position]
-    when 'highest'
+    when 'highest'
-      @tracker.move_to_top
+      @tracker.move_to_top
-    when 'higher'
+    when 'higher'
-      @tracker.move_higher
+      @tracker.move_higher
-    when 'lower'
+    when 'lower'
-      @tracker.move_lower
+      @tracker.move_lower
-    when 'lowest'
+    when 'lowest'
-      @tracker.move_to_bottom
+      @tracker.move_to_bottom
-    end if params[:position]
+    end if params[:position]
-    redirect_to :action => 'list'
+    redirect_to :action => 'list'
-  end
+  end
   
   def destroy
-    @tracker = Tracker.find(params[:id])
+    @tracker = Tracker.find(params[:id])
-    unless @tracker.issues.empty?
+    unless @tracker.issues.empty?
-      flash[:notice] = "This tracker contains issues and can\'t be deleted."
+      flash[:notice] = "This tracker contains issues and can\'t be deleted."
-    else
+    else
-      @tracker.destroy
+      @tracker.destroy
     end
     redirect_to :action => 'list'
   end  

app/controllers/users_controller.rb

@@ -1,120 +1,113 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class UsersController < ApplicationController
+class UsersController < ApplicationController
-  layout 'base'	
+  layout 'base'	
-  before_filter :require_admin
+  before_filter :require_admin
-
+
-  helper :sort
+  helper :sort
-  include SortHelper
+  include SortHelper
-  helper :custom_fields
+  helper :custom_fields
-  include CustomFieldsHelper   
+  include CustomFieldsHelper   
 
   def index
     list
     render :action => 'list' unless request.xhr?
   end
 
-  def list
+  def list
-    sort_init 'login', 'asc'
+    sort_init 'login', 'asc'
-    sort_update
+    sort_update
-    
+    @user_count = User.count		
-    @status = params[:status] ? params[:status].to_i : 1    
+    @user_pages = Paginator.new self, @user_count,
-    conditions = nil
+								15,
-    conditions = ["status=?", @status] unless @status == 0
+								params['page']								
-    
+    @users =  User.find :all,:order => sort_clause,
-    @user_count = User.count(:conditions => conditions)
+						:limit  =>  @user_pages.items_per_page,
-    @user_pages = Paginator.new self, @user_count,
+						:offset =>  @user_pages.current.offset
-								15,
+
-								params['page']								
-    @users =  User.find :all,:order => sort_clause,
-                        :conditions => conditions,
-						:limit  =>  @user_pages.items_per_page,
-						:offset =>  @user_pages.current.offset
-
     render :action => "list", :layout => false if request.xhr?	
   end
 
   def add
-    if request.get?
+    if request.get?
-      @user = User.new(:language => Setting.default_language)
+      @user = User.new(:language => Setting.default_language)
-      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
+      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
     else
-      @user = User.new(params[:user])
+      @user = User.new(params[:user])
-      @user.admin = params[:user][:admin] || false
+      @user.admin = params[:user][:admin] || false
-      @user.login = params[:user][:login]
+      @user.login = params[:user][:login]
-      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
+      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
-      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
+      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
-      @user.custom_values = @custom_values			
+      @user.custom_values = @custom_values			
       if @user.save
-        Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
         flash[:notice] = l(:notice_successful_create)
         redirect_to :action => 'list'
-      end
+      end
-    end
+    end
     @auth_sources = AuthSource.find(:all)
   end
 
   def edit
     @user = User.find(params[:id])
-    if request.get?
+    if request.get?
-      @custom_values = UserCustomField.find(:all).collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
+      @custom_values = UserCustomField.find(:all).collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
-    else
+    else
-      @user.admin = params[:user][:admin] if params[:user][:admin]
+      @user.admin = params[:user][:admin] if params[:user][:admin]
-      @user.login = params[:user][:login] if params[:user][:login]
+      @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
+      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
-      if params[:custom_fields]
+      if params[:custom_fields]
-        @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
+        @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
-        @user.custom_values = @custom_values
+        @user.custom_values = @custom_values
-      end
+      end
       if @user.update_attributes(params[:user])
         flash[:notice] = l(:notice_successful_update)
         redirect_to :action => 'list'
-      end
+      end
     end
-    @auth_sources = AuthSource.find(:all)
+    @auth_sources = AuthSource.find(:all)
-    @roles = Role.find(:all, :order => 'position')
+    @roles = Role.find(:all, :order => 'position')
-    @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
+    @projects = Project.find(:all) - @user.projects
-    @membership ||= Member.new
+    @membership ||= Member.new
-  end
+  end
-  
+  
-  def edit_membership
+  def edit_membership
-    @user = User.find(params[:id])
+    @user = User.find(params[:id])
-    @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
+    @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
-    @membership.attributes = params[:membership]
+    @membership.attributes = params[:membership]
-    if request.post? and @membership.save
+    if request.post? and @membership.save
-      flash[:notice] = l(:notice_successful_update)
+      flash[:notice] = l(:notice_successful_update)
-    end
+    end
-    redirect_to :action => 'edit', :id => @user and return
+    redirect_to :action => 'edit', :id => @user and return
-  end
+  end
-  
+  
-  def destroy_membership
+  def destroy_membership
-    @user = User.find(params[:id])
+    @user = User.find(params[:id])
-    if request.post? and Member.find(params[:membership_id]).destroy
+    if request.post? and Member.find(params[:membership_id]).destroy
-      flash[:notice] = l(:notice_successful_update)
+      flash[:notice] = l(:notice_successful_update)
-    end
+    end
-    redirect_to :action => 'edit', :id => @user and return
+    redirect_to :action => 'edit', :id => @user and return
   end
 
   def destroy
     User.find(params[:id]).destroy
+    redirect_to :action => 'list'
+  rescue
+    flash[:notice] = "Unable to delete user"
     redirect_to :action => 'list'
-  rescue
+  end  
-    flash[:notice] = "Unable to delete user"
-    redirect_to :action => 'list'
-  end  
 end

app/controllers/versions_controller.rb

@@ -1,23 +1,23 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class VersionsController < ApplicationController
+class VersionsController < ApplicationController
-  layout 'base'
+  layout 'base'
-  before_filter :find_project, :authorize
+  before_filter :find_project, :authorize
 
   def edit
     if request.post? and @version.update_attributes(params[:version])
@@ -26,33 +26,33 @@ class VersionsController < ApplicationController
     end
   end
 
-  def destroy
+  def destroy
     @version.destroy
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-  rescue
+  rescue
-    flash[:notice] = "Unable to delete version"
+    flash[:notice] = "Unable to delete version"
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-  end
+  end
-
+
-  def download
+  def download
-    @attachment = @version.attachments.find(params[:attachment_id])
+    @attachment = @version.attachments.find(params[:attachment_id])
-    @attachment.increment_download
+    @attachment.increment_download
-    send_file @attachment.diskfile, :filename => @attachment.filename
+    send_file @attachment.diskfile, :filename => @attachment.filename
-  rescue
+  rescue
-    render_404
+    render_404
-  end 
+  end 
-  
+  
-  def destroy_file
+  def destroy_file
-    @version.attachments.find(params[:attachment_id]).destroy
+    @version.attachments.find(params[:attachment_id]).destroy
-    flash[:notice] = l(:notice_successful_delete)
+    flash[:notice] = l(:notice_successful_delete)
-    redirect_to :controller => 'projects', :action => 'list_files', :id => @project
+    redirect_to :controller => 'projects', :action => 'list_files', :id => @project
-  end
+  end
-
+
-private
+private
-  def find_project
+  def find_project
-    @version = Version.find(params[:id])
+    @version = Version.find(params[:id])
-    @project = @version.project
+    @project = @version.project
-  rescue ActiveRecord::RecordNotFound
+  rescue ActiveRecord::RecordNotFound
-    render_404
+    render_404
   end  
 end

app/controllers/watchers_controller.rb

@@ -1,49 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class WatchersController < ApplicationController
-  layout 'base'
-  before_filter :require_login, :find_project, :check_project_privacy
-  
-  def add
-    user = logged_in_user
-    @watched.add_watcher(user)
-    respond_to do |format|
-      format.html { render :text => 'Watcher added.', :layout => true }
-      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
-    end
-  end
-  
-  def remove
-    user = logged_in_user
-    @watched.remove_watcher(user)
-    respond_to do |format|
-      format.html { render :text => 'Watcher removed.', :layout => true }
-      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
-    end
-  end
-
-private
-  def find_project
-    klass = Object.const_get(params[:object_type].camelcase)
-    return false unless klass.respond_to?('watched_by')
-    @watched = klass.find(params[:object_id])
-    @project = @watched.project
-  rescue
-    render_404
-  end
-end

app/controllers/welcome_controller.rb

@@ -1,25 +1,25 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class WelcomeController < ApplicationController
+class WelcomeController < ApplicationController
-  layout 'base'
+  layout 'base'
-
+
-  def index
+  def index
-    @news = News.latest logged_in_user
+    @news = News.latest logged_in_user
-    @projects = Project.latest logged_in_user
+    @projects = Project.latest logged_in_user
   end
 end

app/controllers/wiki_controller.rb

@@ -1,163 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-require 'diff'
-
-class WikiController < ApplicationController
-  layout 'base'
-  before_filter :find_wiki, :check_project_privacy
-  before_filter :authorize, :only => [:destroy, :add_attachment, :destroy_attachment]
-  
-  verify :method => :post, :only => [:destroy, :destroy_attachment], :redirect_to => { :action => :index }
-
-  helper :attachments
-  include AttachmentsHelper   
-  
-  # display a page (in editing mode if it doesn't exist)
-  def index
-    page_title = params[:page]
-    @page = @wiki.find_or_new_page(page_title)
-    if @page.new_record?
-      edit
-      render :action => 'edit' and return
-    end
-    @content = @page.content_for_version(params[:version])
-    if params[:export] == 'html'
-      export = render_to_string :action => 'export', :layout => false
-      send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
-      return
-    elsif params[:export] == 'txt'
-      send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
-      return
-    end
-    render :action => 'show'
-  end
-  
-  # edit an existing page or a new one
-  def edit
-    @page = @wiki.find_or_new_page(params[:page])    
-    @page.content = WikiContent.new(:page => @page) if @page.new_record?
-    
-    @content = @page.content_for_version(params[:version])
-    @content.text = "h1. #{@page.pretty_title}" if @content.text.blank?
-    # don't keep previous comment
-    @content.comments = nil
-    if request.post?      
-      if @content.text == params[:content][:text]
-        # don't save if text wasn't changed
-        redirect_to :action => 'index', :id => @project, :page => @page.title
-        return
-      end
-      #@content.text = params[:content][:text]
-      #@content.comments = params[:content][:comments]
-      @content.attributes = params[:content]
-      @content.author = logged_in_user
-      # if page is new @page.save will also save content, but not if page isn't a new record
-      if (@page.new_record? ? @page.save : @content.save)
-        redirect_to :action => 'index', :id => @project, :page => @page.title
-      end
-    end
-  rescue ActiveRecord::StaleObjectError
-    # Optimistic locking exception
-    flash[:notice] = l(:notice_locking_conflict)
-  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, 25, params['p']
-    # don't load text    
-    @versions = @page.content.versions.find :all, 
-                                            :select => "id, author_id, comments, updated_on, version",
-                                            :order => 'version DESC',
-                                            :limit  =>  @version_pages.items_per_page + 1,
-                                            :offset =>  @version_pages.current.offset
-
-    render :layout => false if request.xhr?
-  end
-  
-  def diff
-    @page = @wiki.find_page(params[:page])
-    @diff = @page.diff(params[:version], params[:version_from])
-    render_404 unless @diff
-  end
-  
-  # remove a wiki page and its history
-  def destroy
-    @page = @wiki.find_page(params[:page])
-    @page.destroy if @page
-    redirect_to :action => 'special', :id => @project, :page => 'Page_index'
-  end
-
-  # display special pages
-  def special
-    page_title = params[:page].downcase
-    case page_title
-    # show pages index, sorted by title
-    when 'page_index'
-      # eager load information about last updates, without loading text
-      @pages = @wiki.pages.find :all, :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
-                                      :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
-                                      :order => 'title'
-    # export wiki to a single html file
-    when 'export'
-      @pages = @wiki.pages.find :all, :order => 'title'
-      export = render_to_string :action => 'export_multiple', :layout => false
-      send_data(export, :type => 'text/html', :filename => "wiki.html")
-      return      
-    else
-      # requested special page doesn't exist, redirect to default page
-      redirect_to :action => 'index', :id => @project, :page => nil and return
-    end
-    render :action => "special_#{page_title}"
-  end
-  
-  def preview
-    page = @wiki.find_page(params[:page])
-    @attachements = page.attachments if page
-    @text = params[:content][:text]
-    render :partial => 'preview'
-  end
-
-  def add_attachment
-    @page = @wiki.find_page(params[:page])
-    # Save the attachments
-    params[:attachments].each { |file|
-      next unless file.size > 0
-      a = Attachment.create(:container => @page, :file => file, :author => logged_in_user)
-    } if params[:attachments] and params[:attachments].is_a? Array
-    redirect_to :action => 'index', :page => @page.title
-  end
-
-  def destroy_attachment
-    @page = @wiki.find_page(params[:page])
-    @page.attachments.find(params[:attachment_id]).destroy
-    redirect_to :action => 'index', :page => @page.title
-  end
-
-private
-  
-  def find_wiki
-    @project = Project.find(params[:id])
-    @wiki = @project.wiki
-    render_404 unless @wiki
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/helpers/account_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module AccountHelper
 end

app/helpers/admin_helper.rb

@@ -1,23 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module AdminHelper
-  def project_status_options_for_select(selected)
-    options_for_select([[l(:label_all), "*"], 
-                        [l(:status_active), 1]], selected)
-  end
 end

app/helpers/application_helper.rb

@@ -1,290 +1,193 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class RedCloth
+module ApplicationHelper
-  # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
+
-  # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
+  # Return current logged in user or nil
-  def hard_break( text ) 
+  def loggedin?
-    text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks 
+    @logged_in_user
-  end 
+  end
+  
+  # Return true if user is logged in and is admin, otherwise false
+  def admin_loggedin?
+    @logged_in_user and @logged_in_user.admin?
+  end
+
+  # Return true if user is authorized for controller/action, otherwise false
+  def authorize_for(controller, action)  
+    # check if action is allowed on public projects
+    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
+      return true
+    end
+    # check if user is authorized    
+    if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project.id)  )  )
+      return true
+    end
+    return false
+  end
+
+  # Display a link if user is authorized
+  def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
+    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
+  end
+
+  # Display a link to user's account page
+  def link_to_user(user)
+    link_to user.display_name, :controller => 'account', :action => 'show', :id => user
+  end
+  
+  def image_to_function(name, function, html_options = {})
+    html_options.symbolize_keys!
+    tag(:input, html_options.merge({ 
+        :type => "image", :src => image_path(name), 
+        :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};" 
+        }))
+  end
+  
+  def format_date(date)
+    l_date(date) if date
+  end
+  
+  def format_time(time)
+    l_datetime(time) if time
+  end
+  
+  def day_name(day)
+    l(:general_day_names).split(',')[day-1]
+  end
+  
+  def month_name(month)
+    l(:actionview_datehelper_select_month_names).split(',')[month-1]
+  end
+
+  def pagination_links_full(paginator, options={}, html_options={})
+    html = ''    
+    html << link_to_remote(('&#171; ' + l(:label_previous)), 
+                            {:update => "content", :url => { :page => paginator.current.previous }},
+                            {:href => url_for(:action => 'list', :params => params.merge({:page => paginator.current.previous}))}) + ' ' if paginator.current.previous
+                            
+    html << (pagination_links_each(paginator, options) do |n|
+      link_to_remote(n.to_s, 
+                      {:url => {:action => 'list', :params => params.merge({:page => n})}, :update => 'content'},
+                      {:href => url_for(:action => 'list', :params => params.merge({:page => n}))})
+    end || '')
+    
+    html << ' ' + link_to_remote((l(:label_next) + ' &#187;'), 
+                                 {:update => "content", :url => { :page => paginator.current.next }},
+                                 {:href => url_for(:action => 'list', :params => params.merge({:page => paginator.current.next}))}) if paginator.current.next
+    html  
+  end
+  
+  def textilizable(text)
+    (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize") ? RedCloth.new(h(text)).to_html : simple_format(auto_link(h(text)))
+  end
+  
+  def error_messages_for(object_name, options = {})
+    options = options.symbolize_keys
+    object = instance_variable_get("@#{object_name}")
+    if object && !object.errors.empty?
+      # build full_messages here with controller current language
+      full_messages = []
+      object.errors.each do |attr, msg|
+        next if msg.nil?
+        if attr == "base"
+          full_messages << l(msg)
+        else
+          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
+        end
+      end
+      # retrieve custom values error messages
+      if object.errors[:custom_values]
+        object.custom_values.each do |v| 
+          v.errors.each do |attr, msg|
+            next if msg.nil?
+            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
+          end
+        end
+      end      
+      content_tag("div",
+        content_tag(
+          options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
+        ) +
+        content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
+        "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
+      )
+    else
+      ""
+    end
+  end
+  
+  def lang_options_for_select(blank=true)
+    (blank ? [["(auto)", ""]] : []) + 
+      (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
+  end
+  
+  def label_tag_for(name, option_tags = nil, options = {})
+    label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
+    content_tag("label", label_text)
+  end
+  
+  def labelled_tabular_form_for(name, object, options, &proc)
+    options[:html] ||= {}
+    options[:html].store :class, "tabular"
+    form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
+  end
+  
+  def check_all_links(form_name)
+    link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
+    " | " +
+    link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")   
+  end
+  
+  def calendar_for(field_id)
+    image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
+    javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
+  end
 end
-
+
-module ApplicationHelper
+class TabularFormBuilder < ActionView::Helpers::FormBuilder
-
+  include GLoc
-  # Return current logged in user or nil
+  
-  def loggedin?
+  def initialize(object_name, object, template, options, proc)
-    @logged_in_user
+    set_language_if_valid options.delete(:lang)
-  end
+    @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
-  
+  end      
-  # Return true if user is logged in and is admin, otherwise false
+      
-  def admin_loggedin?
+  (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
-    @logged_in_user and @logged_in_user.admin?
+    src = <<-END_SRC
-  end
+    def #{selector}(field, options = {}) 
-
+      return super if options.delete :no_label
-  # Return true if user is authorized for controller/action, otherwise false
+      label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
-  def authorize_for(controller, action)  
+      label = @template.content_tag("label", label_text, 
-    # check if action is allowed on public projects
+                    :class => (@object && @object.errors[field] ? "error" : nil), 
-    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
+                    :for => (@object_name.to_s + "_" + field.to_s))
-      return true
+      label + super
-    end
+    end
-    # check if user is authorized    
+    END_SRC
-    if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project)  )  )
+    class_eval src, __FILE__, __LINE__
-      return true
+  end
-    end
+  
-    return false
+  def select(field, choices, options = {}, html_options = {}) 
-  end
+    label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
-
+    label = @template.content_tag("label", label_text, 
-  # Display a link if user is authorized
+                  :class => (@object && @object.errors[field] ? "error" : nil), 
-  def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
+                  :for => (@object_name.to_s + "_" + field.to_s))
-    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
+    label + super
-  end
+  end
-
+
-  # Display a link to user's account page
+end
-  def link_to_user(user)
+
-    link_to user.name, :controller => 'account', :action => 'show', :id => user
-  end
-  
-  def link_to_issue(issue)
-    link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
-  end
-  
-  def toggle_link(name, id, options={})
-    onclick = "Element.toggle('#{id}'); "
-    onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
-    onclick << "return false;"
-    link_to(name, "#", :onclick => onclick)
-  end
-  
-  def image_to_function(name, function, html_options = {})
-    html_options.symbolize_keys!
-    tag(:input, html_options.merge({ 
-        :type => "image", :src => image_path(name), 
-        :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};" 
-        }))
-  end
-  
-  def format_date(date)
-    return nil unless date
-    @date_format_setting ||= Setting.date_format.to_i
-    @date_format_setting == 0 ? l_date(date) : date.strftime("%Y-%m-%d")
-  end
-  
-  def format_time(time)
-    return nil unless time
-    @date_format_setting ||= Setting.date_format.to_i
-    time = time.to_time if time.is_a?(String)
-    @date_format_setting == 0 ? l_datetime(time) : (time.strftime("%Y-%m-%d") + ' ' + l_time(time))
-  end
-  
-  def day_name(day)
-    l(:general_day_names).split(',')[day-1]
-  end
-  
-  def month_name(month)
-    l(:actionview_datehelper_select_month_names).split(',')[month-1]
-  end
-
-  def pagination_links_full(paginator, options={}, html_options={})
-    page_param = options.delete(:page_param) || :page
-  
-    html = ''    
-    html << link_to_remote(('&#171; ' + l(:label_previous)), 
-                            {:update => "content", :url => options.merge(page_param => paginator.current.previous)},
-                            {:href => url_for(:params => options.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
-                            
-    html << (pagination_links_each(paginator, options) do |n|
-      link_to_remote(n.to_s, 
-                      {:url => {:params => options.merge(page_param => n)}, :update => 'content'},
-                      {:href => url_for(:params => options.merge(page_param => n))})
-    end || '')
-    
-    html << ' ' + link_to_remote((l(:label_next) + ' &#187;'), 
-                                 {:update => "content", :url => options.merge(page_param => paginator.current.next)},
-                                 {:href => url_for(:params => options.merge(page_param => paginator.current.next))}) if paginator.current.next
-    html  
-  end
-  
-  # textilize text according to system settings and RedCloth availability
-  def textilizable(text, options = {})
-    return "" if text.blank?
-    
-    # different methods for formatting wiki links
-    case options[:wiki_links]
-    when :local
-      # used for local links to html files
-      format_wiki_link = Proc.new {|title| "#{title}.html" }
-    when :anchor
-      # used for single-file wiki export
-      format_wiki_link = Proc.new {|title| "##{title}" }
-    else
-      if @project
-        format_wiki_link = Proc.new {|title| url_for :controller => 'wiki', :action => 'index', :id => @project, :page => title }
-      else
-        format_wiki_link = Proc.new {|title| title }
-      end
-    end
-    
-    # turn wiki links into textile links: 
-    # example:
-    #   [[link]] -> "link":link
-    #   [[link|title]] -> "title":link
-    text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) {|m| "\"#{$3 || $1}\":" + format_wiki_link.call(Wiki.titleize($1)) }
-
-    # turn issue ids into links
-    # example:
-    #   #52 -> <a href="/issues/show/52">#52</a>
-    text = text.gsub(/#(\d+)(?=\b)/) {|m| link_to "##{$1}", :controller => 'issues', :action => 'show', :id => $1}
-       
-    # turn revision ids into links (@project needed)
-    # example:
-    #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (@project.id is 6)
-    text = text.gsub(/(?=\b)r(\d+)(?=\b)/) {|m| link_to "r#{$1}", :controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1} if @project
-    
-    # when using an image link, try to use an attachment, if possible
-    attachments = options[:attachments]
-    if attachments
-      text = text.gsub(/!([<>=]*)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
-        align = $1
-        filename = $2
-        rf = Regexp.new(filename,  Regexp::IGNORECASE)
-        # search for the picture in attachments
-        if found = attachments.detect { |att| att.filename =~ rf }
-          image_url = url_for :controller => 'attachments', :action => 'show', :id => found.id
-          "!#{align}#{image_url}!"
-        else
-          "!#{align}#{filename}!"
-        end
-      end
-    end
-
-    # finally textilize text
-    @do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
-    text = @do_textilize ? auto_link(RedCloth.new(text, [:hard_breaks]).to_html) : simple_format(auto_link(h(text)))
-  end
-  
-  # Same as Rails' simple_format helper without using paragraphs
-  def simple_format_without_paragraph(text)
-    text.to_s.
-      gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
-      gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
-      gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
-  end
-  
-  def error_messages_for(object_name, options = {})
-    options = options.symbolize_keys
-    object = instance_variable_get("@#{object_name}")
-    if object && !object.errors.empty?
-      # build full_messages here with controller current language
-      full_messages = []
-      object.errors.each do |attr, msg|
-        next if msg.nil?
-        msg = msg.first if msg.is_a? Array
-        if attr == "base"
-          full_messages << l(msg)
-        else
-          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
-        end
-      end
-      # retrieve custom values error messages
-      if object.errors[:custom_values]
-        object.custom_values.each do |v| 
-          v.errors.each do |attr, msg|
-            next if msg.nil?
-            msg = msg.first if msg.is_a? Array
-            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
-          end
-        end
-      end      
-      content_tag("div",
-        content_tag(
-          options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
-        ) +
-        content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
-        "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
-      )
-    else
-      ""
-    end
-  end
-  
-  def lang_options_for_select(blank=true)
-    (blank ? [["(auto)", ""]] : []) + 
-      GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.first <=> y.first }
-  end
-  
-  def label_tag_for(name, option_tags = nil, options = {})
-    label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
-    content_tag("label", label_text)
-  end
-  
-  def labelled_tabular_form_for(name, object, options, &proc)
-    options[:html] ||= {}
-    options[:html].store :class, "tabular"
-    form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
-  end
-  
-  def check_all_links(form_name)
-    link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
-    " | " +
-    link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")   
-  end
-  
-  def calendar_for(field_id)
-    image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
-    javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
-  end
-  
-  def wikitoolbar_for(field_id)
-    return '' unless Setting.text_formatting == 'textile'
-    javascript_include_tag('jstoolbar') + javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();")
-  end
-end
-
-class TabularFormBuilder < ActionView::Helpers::FormBuilder
-  include GLoc
-  
-  def initialize(object_name, object, template, options, proc)
-    set_language_if_valid options.delete(:lang)
-    @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
-  end      
-      
-  (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
-    src = <<-END_SRC
-    def #{selector}(field, options = {}) 
-      return super if options.delete :no_label
-      label_text = l(options[:label]) if options[:label]
-      label_text ||= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym)
-      label_text << @template.content_tag("span", " *", :class => "required") if options.delete(:required)
-      label = @template.content_tag("label", label_text, 
-                    :class => (@object && @object.errors[field] ? "error" : nil), 
-                    :for => (@object_name.to_s + "_" + field.to_s))
-      label + super
-    end
-    END_SRC
-    class_eval src, __FILE__, __LINE__
-  end
-  
-  def select(field, choices, options = {}, html_options = {}) 
-    label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
-    label = @template.content_tag("label", label_text, 
-                  :class => (@object && @object.errors[field] ? "error" : nil), 
-                  :for => (@object_name.to_s + "_" + field.to_s))
-    label + super
-  end
-
-end
-

app/helpers/attachments_helper.rb

@@ -1,25 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-module AttachmentsHelper
-  # displays the links to a collection of attachments
-  def link_to_attachments(attachments, options = {})
-    if attachments.any?
-      render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
-    end
-  end
-end

app/helpers/boards_helper.rb

@@ -1,19 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-module BoardsHelper
-end

app/helpers/custom_fields_helper.rb

@@ -1,77 +1,77 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-module CustomFieldsHelper
+module CustomFieldsHelper
-
+
-  # Return custom field html tag corresponding to its format
+  # Return custom field html tag corresponding to its format
-  def custom_field_tag(custom_value)	
+  def custom_field_tag(custom_value)	
-    custom_field = custom_value.custom_field
+    custom_field = custom_value.custom_field
-    field_name = "custom_fields[#{custom_field.id}]"
+    field_name = "custom_fields[#{custom_field.id}]"
-    field_id = "custom_fields_#{custom_field.id}"
+    field_id = "custom_fields_#{custom_field.id}"
-    
+    
-    case custom_field.field_format
+    case custom_field.field_format
-    when "string", "int"
+    when "string", "int"
-      text_field 'custom_value', 'value', :name => field_name, :id => field_id
+      text_field 'custom_value', 'value', :name => field_name, :id => field_id
-    when "date"
+    when "date"
-      text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) + 
+      text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) + 
-      calendar_for(field_id)
+      calendar_for(field_id)
-    when "text"
+    when "text"
-      text_area 'custom_value', 'value', :name => field_name, :id => field_id, :cols => 60, :rows => 3
+      text_area 'custom_value', 'value', :name => field_name, :id => field_id, :cols => 60, :rows => 3
-    when "bool"
+    when "bool"
-      check_box 'custom_value', 'value', :name => field_name, :id => field_id
+      check_box 'custom_value', 'value', :name => field_name, :id => field_id
-    when "list"
+    when "list"
-      select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id
+      select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id
-    end
+    end
-  end
+  end
-  
+  
-  # Return custom field label tag
+  # Return custom field label tag
-  def custom_field_label_tag(custom_value)
+  def custom_field_label_tag(custom_value)
-    content_tag "label", custom_value.custom_field.name +
+    content_tag "label", custom_value.custom_field.name +
-	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
+	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
-	:for => "custom_fields_#{custom_value.custom_field.id}",
+	:for => "custom_fields_#{custom_value.custom_field.id}",
-	:class => (custom_value.errors.empty? ? nil : "error" )
+	:class => (custom_value.errors.empty? ? nil : "error" )
-  end
+  end
-  
+  
-  # Return custom field tag with its label tag
+  # Return custom field tag with its label tag
-  def custom_field_tag_with_label(custom_value)
+  def custom_field_tag_with_label(custom_value)
-    custom_field_label_tag(custom_value) + custom_field_tag(custom_value)
+    custom_field_label_tag(custom_value) + custom_field_tag(custom_value)
-  end
+  end
-
+
-  # Return a string used to display a custom value
+  # Return a string used to display a custom value
-  def show_value(custom_value)
+  def show_value(custom_value)
-    return "" unless custom_value
+    return "" unless custom_value
-    format_value(custom_value.value, custom_value.custom_field.field_format)
+    format_value(custom_value.value, custom_value.custom_field.field_format)
-  end
+  end
-  
+  
-  # Return a string used to display a custom value
+  # Return a string used to display a custom value
-  def format_value(value, field_format)
+  def format_value(value, field_format)
-    return "" unless value && !value.empty?
+    return "" unless value && !value.empty?
-    case field_format
+    case field_format
-    when "date"
+    when "date"
-      begin; l_date(value.to_date); rescue; value end
+      begin; l_date(value.to_date); rescue; value end
-    when "bool"
+    when "bool"
-      l_YesNo(value == "1")
+      l_YesNo(value == "1")
-    else
+    else
-      value
+      value
-    end
+    end
-  end
+  end
-
+
-  # Return an array of custom field formats which can be used in select_tag
+  # Return an array of custom field formats which can be used in select_tag
-  def custom_field_formats_for_select
+  def custom_field_formats_for_select
-    CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
+    CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
   end
 end

app/helpers/documents_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module DocumentsHelper
 end

app/helpers/enumerations_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module EnumerationsHelper
 end

app/helpers/help_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module HelpHelper
 end

app/helpers/ifpdf_helper.rb

@@ -1,75 +1,53 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-require 'iconv'
+require 'iconv'
-require 'rfpdf/chinese'
+
-
+module IfpdfHelper
-module IfpdfHelper  
+
-  
+  class IFPDF < FPDF
-  class IFPDF < FPDF
+
-    include GLoc
+    attr_accessor :footer_date
-    attr_accessor :footer_date
+    
-    
+    def initialize
-    def initialize(lang)
+      super
-      super()
+      SetCreator("redMine #{Redmine::VERSION}")
-      set_language_if_valid lang
+    end
-      case current_language
+      
-      when :ja
+    def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
-        extend(PDF_Japanese)
+      @ic ||= Iconv.new('ISO-8859-1', 'UTF-8')
-        AddSJISFont()
+      txt = begin
-        @font_for_content = 'SJIS'
+        @ic.iconv(txt)
-        @font_for_footer = 'SJIS'
+      rescue
-      when :zh
+        txt
-        extend(PDF_Chinese)
+      end
-        AddBig5Font()
+      super w,h,txt,border,ln,align,fill,link
-        @font_for_content = 'Big5'
+    end
-        @font_for_footer = 'Big5'
+    
-      else
+    def Footer
-        @font_for_content = 'Arial'
+      SetFont('Helvetica', 'I', 8)
-        @font_for_footer = 'Helvetica'              
+      SetY(-15)
-      end
+      SetX(15)
-      SetCreator("redMine #{Redmine::VERSION}")
+      Cell(0, 5, @footer_date, 0, 0, 'L')
-      SetFont(@font_for_content)
+      SetY(-15)
-    end
+      SetX(-30)
-    
+      Cell(0, 5, PageNo().to_s + '/{nb}', 0, 0, 'C')
-    def SetFontStyle(style, size)
+    end
-      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')
-      txt = begin
-        @ic.iconv(txt)
-      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
+end

app/helpers/issue_categories_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module IssueCategoriesHelper
 end

app/helpers/issue_relations_helper.rb

@@ -1,23 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-module IssueRelationsHelper
-  def collection_for_relation_type_select
-    values = IssueRelation::TYPES
-    values.keys.sort{|x,y| values[x][:order] <=> values[y][:order]}.collect{|k| [l(values[k][:name]), k]}
-  end
-end

app/helpers/issue_statuses_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module IssueStatusesHelper
 end

app/helpers/issues_helper.rb

@@ -1,86 +1,74 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-module IssuesHelper
+module IssuesHelper
-
+
-  def show_detail(detail, no_html=false)
+  def show_detail(detail, no_html=false)
-    case detail.property
+    case detail.property
-    when 'attr'
+    when 'attr'
-      label = l(("field_" + detail.prop_key.to_s.gsub(/\_id$/, "")).to_sym)   
+      label = l(("field_" + detail.prop_key.to_s.gsub(/\_id$/, "")).to_sym)   
-      case detail.prop_key
+      case detail.prop_key
-      when 'due_date', 'start_date'
+      when 'due_date', 'start_date'
-        value = format_date(detail.value.to_date) if detail.value
+        value = format_date(detail.value.to_date) if detail.value
-        old_value = format_date(detail.old_value.to_date) if detail.old_value
+        old_value = format_date(detail.old_value.to_date) if detail.old_value
-      when 'status_id'
+      when 'status_id'
-        s = IssueStatus.find_by_id(detail.value) and value = s.name if detail.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
+        s = IssueStatus.find_by_id(detail.old_value) and old_value = s.name if detail.old_value
-      when 'assigned_to_id'
+      when 'assigned_to_id'
-        u = User.find_by_id(detail.value) and value = u.name if detail.value
+        u = User.find_by_id(detail.value) and value = u.name if detail.value
-        u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value
+        u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value
-      when 'priority_id'
+      when 'priority_id'
-        e = Enumeration.find_by_id(detail.value) and value = e.name if detail.value
+        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
+        e = Enumeration.find_by_id(detail.old_value) and old_value = e.name if detail.old_value
-      when 'category_id'
+      when 'category_id'
-        c = IssueCategory.find_by_id(detail.value) and value = c.name if detail.value
+        c = IssueCategory.find_by_id(detail.value) and value = c.name if detail.value
-        c = IssueCategory.find_by_id(detail.old_value) and old_value = c.name if detail.old_value
+        c = IssueCategory.find_by_id(detail.old_value) and old_value = c.name if detail.old_value
-      when 'fixed_version_id'
+      when 'fixed_version_id'
-        v = Version.find_by_id(detail.value) and value = v.name if detail.value
+        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
+        v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
-      end
+      end
-    when 'cf'
+    when 'cf'
-      custom_field = CustomField.find_by_id(detail.prop_key)
+      custom_field = CustomField.find_by_id(detail.prop_key)
-      if custom_field
+      if custom_field
-        label = custom_field.name
+        label = custom_field.name
-        value = format_value(detail.value, custom_field.field_format) if detail.value
+        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
+        old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
-      end
+      end
-    when 'attachment'
+    end
-      label = l(:label_attachment)
+       
-    end
+    label ||= detail.prop_key
-       
+    value ||= detail.value
-    label ||= detail.prop_key
+    old_value ||= detail.old_value
-    value ||= detail.value
+    
-    old_value ||= detail.old_value
+    unless no_html
-    
+      label = content_tag('strong', label)
-    unless no_html
+      old_value = content_tag("i", h(old_value)) if detail.old_value
-      label = content_tag('strong', label)
+      old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
-      old_value = content_tag("i", h(old_value)) if detail.old_value
+      value = content_tag("i", h(value)) if value
-      old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
+    end
-      value = content_tag("i", h(value)) if value
+    
-    end
+    if detail.value and !detail.value.to_s.empty?
-    
+      if old_value
-    if detail.value and !detail.value.to_s.empty?
+        label + " " + l(:text_journal_changed, old_value, value)
-      case detail.property
+      else
-      when 'attr', 'cf'
+        label + " " + l(:text_journal_set_to, value)
-        if old_value
+      end
-          label + " " + l(:text_journal_changed, old_value, value)
+    else
-        else
+      label + " " + l(:text_journal_deleted) + " (#{old_value})"
-          label + " " + l(:text_journal_set_to, value)
+    end
-        end
-      when 'attachment'
-        "#{label} #{value} #{l(:label_added)}"
-      end
-    else
-      case detail.property
-      when 'attr', 'cf'
-        label + " " + l(:text_journal_deleted) + " (#{old_value})"
-      when 'attachment'
-        "#{label} #{old_value} #{l(:label_deleted)}"
-      end
-    end
   end
 end

app/helpers/members_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module MembersHelper
 end

app/helpers/messages_helper.rb

@@ -1,28 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-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/news_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module NewsHelper
 end

app/helpers/projects_helper.rb

@@ -1,28 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module ProjectsHelper
-  def link_to_version(version, options = {})
-    return '' unless version && version.is_a?(Version)
-    link_to version.name, {:controller => 'projects',
-                           :action => 'roadmap',
-                           :id => version.project_id,
-                           :completed => (version.completed? ? 1 : nil),
-                           :anchor => version.name
-                          }, options
-  end
 end

app/helpers/reports_helper.rb

@@ -1,32 +1,32 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-module ReportsHelper
+module ReportsHelper
-  
+  
-  def aggregate(data, criteria)
+  def aggregate(data, criteria)
-    a = 0
+    a = 0
-    data.each { |row|
+    data.each { |row|
-      match = 1
+      match = 1
-      criteria.each { |k, v|
+      criteria.each { |k, v|
-        match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' && row[k] == (v == 0 ? "f" : "t"))
+        match = 0 unless row[k].to_s == v.to_s
-      } unless criteria.nil?
+      } unless criteria.nil?
-      a = a + row["total"].to_i if match == 1
+      a = a + row["total"].to_i if match == 1
-    } unless data.nil?
+    } unless data.nil?
-    a
+    a
-  end
+  end
   
 end

app/helpers/repositories_helper.rb

@@ -16,43 +16,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module RepositoriesHelper
-  def repository_field_tags(form, repository)    
-    method = repository.class.name.demodulize.underscore + "_field_tags"
-    send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
-  end
-  
-  def scm_select_tag
-    container = [[]]
-    REDMINE_SUPPORTED_SCM.each {|scm| container << ["Repository::#{scm}".constantize.scm_name, scm]}
-    select_tag('repository_scm', 
-               options_for_select(container, @project.repository.class.name.demodulize),
-               :disabled => (@project.repository && !@project.repository.new_record?),
-               :onchange => remote_function(:update => "repository_fields", :url => { :controller => 'repositories', :action => 'update_form', :id => @project }, :with => "Form.serialize(this.form)")
-               )
-  end
-  
-  def with_leading_slash(path)
-    path ||= ''
-    path.starts_with?("/") ? "/#{path}" : path
-  end
-
-  def subversion_field_tags(form, repository)
-      content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
-                       '<br />(http://, https://, svn://, file:///)') +
-      content_tag('p', form.text_field(:login, :size => 30)) +
-      content_tag('p', form.password_field(:password, :size => 30))
-  end
-
-  def darcs_field_tags(form, repository)
-      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
-  end
-  
-  def mercurial_field_tags(form, repository)
-      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
-  end
-
-  def cvs_field_tags(form, repository)
-      content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
-      content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
-  end
 end

app/helpers/roles_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module RolesHelper
 end

app/helpers/search_helper.rb

@@ -1,28 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-module SearchHelper
-  def highlight_tokens(text, tokens)
-    return text unless tokens && !tokens.empty?
-    regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE    
-    result = ''
-    text.split(regexp).each_with_index do |words, i|
-      result << (i.even? ? (words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', words, :class => 'highlight'))
-    end
-    result
-  end
-end

app/helpers/sort_helper.rb

@@ -107,12 +107,10 @@ module SortHelper
       order = 'desc' # changed for desc order by default
     end
     caption = titleize(Inflector::humanize(column)) unless caption
-    
+    params = {:params => {:sort_key => column, :sort_order => order}}
-    url = {:sort_key => column, :sort_order => order, :issue_id => params[:issue_id], :project_id => params[:project_id]}
-    
     link_to_remote(caption,
-                  {:update => "content", :url => url},
+                  {:update => "content", :url => { :sort_key => column, :sort_order => order}},
-                  {:href => url_for(url)}) +
+                  {:href => url_for(:params => { :sort_key => column, :sort_order => order})}) +
     (icon ? nbsp(2) + image_tag(icon) : '')
   end
 

app/helpers/trackers_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module TrackersHelper
 end

app/helpers/users_helper.rb

@@ -1,25 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module UsersHelper
-  def status_options_for_select(selected)
-    options_for_select([[l(:label_all), "*"], 
-                        [l(:status_active), 1],
-                        [l(:status_registered), 2],
-                        [l(:status_locked), 3]], selected)
-  end
 end

app/helpers/versions_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module VersionsHelper
 end

app/helpers/watchers_helper.rb

@@ -1,36 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-module WatchersHelper
-  def watcher_tag(object, user)
-    content_tag("span", watcher_link(object, user), :id => 'watcher')
-  end
-  
-  def watcher_link(object, user)
-    return '' unless user && object.respond_to?('watched_by?')
-    watched = object.watched_by?(user)
-    url = {:controller => 'watchers',
-           :action => (watched ? 'remove' : 'add'),
-           :object_type => object.class.to_s.underscore,
-           :object_id => object.id}           
-    link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
-                   {:url => url},
-                   :href => url_for(url),
-                   :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
-  
-  end
-end

app/helpers/welcome_helper.rb

@@ -1,19 +1,19 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
 module WelcomeHelper
 end

app/helpers/wiki_helper.rb

@@ -1,56 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-module WikiHelper
-
-  def html_diff(wdiff)
-    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
-    simple_format_without_paragraph(words.join(' '))
-  end
-end

app/models/attachment.rb

@@ -1,96 +1,92 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-require "digest/md5"
+require "digest/md5"
-
+
-class Attachment < ActiveRecord::Base
+class Attachment < ActiveRecord::Base
-  belongs_to :container, :polymorphic => true
+  belongs_to :container, :polymorphic => true
-  belongs_to :author, :class_name => "User", :foreign_key => "author_id"
+  belongs_to :author, :class_name => "User", :foreign_key => "author_id"
-  
+  
-  validates_presence_of :container, :filename
+  validates_presence_of :container, :filename
-  
+  
-  cattr_accessor :storage_path
+  cattr_accessor :storage_path
-  @@storage_path = "#{RAILS_ROOT}/files"
+  @@storage_path = "#{RAILS_ROOT}/files"
-  
+  
-  def validate
+  def validate
-    errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
+    errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
-  end
+  end
-
+
-	def file=(incomming_file)
+	def file=(incomming_file)
-		unless incomming_file.nil?
+		unless incomming_file.nil?
-			@temp_file = incomming_file
+			@temp_file = incomming_file
-			if @temp_file.size > 0
+			if @temp_file.size > 0
-				self.filename = sanitize_filename(@temp_file.original_filename)
+				self.filename = sanitize_filename(@temp_file.original_filename)
-				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
+				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
-				self.content_type = @temp_file.content_type
+				self.content_type = @temp_file.content_type
-				self.filesize = @temp_file.size
+				self.filesize = @temp_file.size
-			end
+			end
-		end
+		end
-	end
+	end
-	
+	
-	def file
+	def file
-	 nil
+	 nil
-	end
+	end
-	
+	
-	# Copy temp file to its final location
+	# Copy temp file to its final location
-	def before_save
+	def before_save
-		if @temp_file && (@temp_file.size > 0)
+		if @temp_file && (@temp_file.size > 0)
-			logger.debug("saving '#{self.diskfile}'")
+			logger.debug("saving '#{self.diskfile}'")
-			File.open(diskfile, "wb") do |f| 
+			File.open(diskfile, "wb") do |f| 
-				f.write(@temp_file.read)
+				f.write(@temp_file.read)
-			end
+			end
-			self.digest = Digest::MD5.hexdigest(File.read(diskfile))
+			self.digest = Digest::MD5.hexdigest(File.read(diskfile))
-		end
+		end
-	end
+	end
-	
+	
-	# Deletes file on the disk
+	# Deletes file on the disk
-	def after_destroy
+	def after_destroy
-		if self.filename?
+		if self.filename?
-			File.delete(diskfile) if File.exist?(diskfile)
+			File.delete(diskfile) if File.exist?(diskfile)
-		end
+		end
-	end
+	end
-	
+	
-	# Returns file's location on disk
+	# Returns file's location on disk
-	def diskfile
+	def diskfile
-		"#{@@storage_path}/#{self.disk_filename}"
+		"#{@@storage_path}/#{self.disk_filename}"
-	end
+	end
-  
+  
-  def increment_download
+  def increment_download
-    increment!(:downloads)
+    increment!(:downloads)
-  end
+  end
-	
+	
-	# returns last created projects
+	# returns last created projects
-	def self.most_downloaded
+	def self.most_downloaded
-		find(:all, :limit => 5, :order => "downloads DESC")	
+		find(:all, :limit => 5, :order => "downloads DESC")	
-	end
+	end
-
+	
-  def project
+private
-    container.is_a?(Project) ? container : container.project
+  def sanitize_filename(value)
-  end
+      # get only the filename, not the whole path
-  
+      just_filename = value.gsub(/^.*(\\|\/)/, '')
-private
+      # NOTE: File.basename doesn't work right with Windows paths on Unix
-  def sanitize_filename(value)
+      # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
-      # get only the filename, not the whole path
+
-      just_filename = value.gsub(/^.*(\\|\/)/, '')
+      # Finally, replace all non alphanumeric, underscore or periods with underscore
-      # NOTE: File.basename doesn't work right with Windows paths on Unix
+      @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
-      # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
+  end
-
-      # Finally, replace all non alphanumeric, underscore or periods with underscore
-      @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
-  end
     
 end

app/models/auth_source_ldap.rb

@@ -1,79 +1,79 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-require 'net/ldap'
+require 'net/ldap'
-require 'iconv'
+require 'iconv'
-
+
-class AuthSourceLdap < AuthSource 
+class AuthSourceLdap < AuthSource 
-  validates_presence_of :host, :port, :attr_login
+  validates_presence_of :host, :port, :attr_login
-
+
-  def after_initialize
+  def after_initialize
-    self.port = 389 if self.port == 0
+    self.port = 389 if self.port == 0
-  end
+  end
-  
+  
-  def authenticate(login, password)
+  def authenticate(login, password)
-    attrs = []
+    attrs = []
-    # get user's DN
+    # get user's DN
-    ldap_con = initialize_ldap_con(self.account, self.account_password)
+    ldap_con = initialize_ldap_con(self.account, self.account_password)
-    login_filter = Net::LDAP::Filter.eq( self.attr_login, login ) 
+    login_filter = Net::LDAP::Filter.eq( self.attr_login, login ) 
-    object_filter = Net::LDAP::Filter.eq( "objectClass", "*" ) 
+    object_filter = Net::LDAP::Filter.eq( "objectClass", "*" ) 
-    dn = String.new
+    dn = String.new
-    ldap_con.search( :base => self.base_dn, 
+    ldap_con.search( :base => self.base_dn, 
-                     :filter => object_filter & login_filter, 
+                     :filter => object_filter & login_filter, 
-                     :attributes=> ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]) do |entry|
+                     :attributes=> ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]) do |entry|
-      dn = entry.dn
+      dn = entry.dn
-      attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
+      attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
-               :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
+               :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
-               :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
+               :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
-               :auth_source_id => self.id ]
+               :auth_source_id => self.id ]
-    end
+    end
-    return nil if dn.empty?
+    return nil if dn.empty?
-    logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
+    logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
-    # authenticate user
+    # authenticate user
-    ldap_con = initialize_ldap_con(dn, password)
+    ldap_con = initialize_ldap_con(dn, password)
-    return nil unless ldap_con.bind
+    return nil unless ldap_con.bind
-    # return user's attributes
+    # return user's attributes
-    logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
+    logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
-    attrs    
+    attrs    
-  rescue  Net::LDAP::LdapError => text
+  rescue  Net::LDAP::LdapError => text
-    raise "LdapError: " + text
+    raise "LdapError: " + text
-  end
+  end
-
+
-  # test the connection to the LDAP
+  # test the connection to the LDAP
-  def test_connection
+  def test_connection
-    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
+  rescue  Net::LDAP::LdapError => text
-    raise "LdapError: " + text
+    raise "LdapError: " + text
-  end
+  end
- 
+ 
-  def auth_method_name
+  def auth_method_name
-    "LDAP"
+    "LDAP"
-  end
+  end
-  
+  
-private
+private
-  def initialize_ldap_con(ldap_user, ldap_password)
+  def initialize_ldap_con(ldap_user, ldap_password)
-    Net::LDAP.new( {:host => self.host, 
+    Net::LDAP.new( {:host => self.host, 
-                    :port => self.port, 
+                    :port => self.port, 
-                    :auth => { :method => :simple, :username => Iconv.new('iso-8859-15', 'utf-8').iconv(ldap_user), :password => Iconv.new('iso-8859-15', 'utf-8').iconv(ldap_password) }} 
+                    :auth => { :method => :simple, :username => Iconv.new('iso-8859-15', 'utf-8').iconv(ldap_user), :password => Iconv.new('iso-8859-15', 'utf-8').iconv(ldap_password) }} 
-    ) 
+    ) 
-  end
+  end
-  
+  
-  def self.get_attr(entry, attr_name)
+  def self.get_attr(entry, attr_name)
-    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

app/models/board.rb

@@ -1,29 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class Board < ActiveRecord::Base
-  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 => :delete_all, :order => "#{Message.table_name}.created_on DESC"
-  belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
-  acts_as_list :scope => :project_id
-  acts_as_watchable
-  
-  validates_presence_of :name, :description
-  validates_length_of :name, :maximum => 30
-  validates_length_of :description, :maximum => 255
-end

app/models/change.rb

@@ -1,22 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class Change < ActiveRecord::Base
-  belongs_to :changeset
-  
-  validates_presence_of :changeset_id, :action, :path
-end

app/models/changeset.rb

@@ -1,69 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class Changeset < ActiveRecord::Base
-  belongs_to :repository
-  has_many :changes, :dependent => :delete_all
-  has_and_belongs_to_many :issues
-  
-  validates_presence_of :repository_id, :revision, :committed_on, :commit_date
-  validates_numericality_of :revision, :only_integer => true
-  validates_uniqueness_of :revision, :scope => :repository_id
-  validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
-  
-  def committed_on=(date)
-    self.commit_date = date
-    super
-  end
-  
-  def after_create
-    scan_comment_for_issue_ids
-  end
-  
-  def scan_comment_for_issue_ids
-    return if comments.blank?
-    # keywords used to reference issues
-    ref_keywords = Setting.commit_ref_keywords.downcase.split(",")
-    # keywords used to fix issues
-    fix_keywords = Setting.commit_fix_keywords.downcase.split(",")
-    # status applied
-    fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
-    
-    kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw.strip)}.join("|")
-    return if kw_regexp.blank?
-    
-    # remove any associated issues
-    self.issues.clear
-    
-    comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
-      action = match[0]
-      target_issue_ids = match[1].scan(/\d+/)
-      target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
-      if fix_status && fix_keywords.include?(action.downcase)
-        # update status of issues
-        logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
-        target_issues.each do |issue|
-          # don't change the status is the issue is already closed
-          next if issue.status.is_closed?
-          issue.status = fix_status
-          issue.save
-        end
-      end
-      self.issues << target_issues
-    end
-  end
-end

app/models/comment.rb

@@ -19,5 +19,5 @@ class Comment < ActiveRecord::Base
   belongs_to :commented, :polymorphic => true, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
-  validates_presence_of :commented, :author, :comments
+  validates_presence_of :commented, :author, :comment
 end

app/models/custom_field.rb

@@ -1,60 +1,60 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class CustomField < ActiveRecord::Base
+class CustomField < ActiveRecord::Base
-  has_many :custom_values, :dependent => :delete_all
+  has_many :custom_values, :dependent => :delete_all
-  serialize :possible_values
+  serialize :possible_values
-  
+  
-  FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
+  FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
-                    "text" => { :name => :label_text, :order => 2 },
+                    "text" => { :name => :label_text, :order => 2 },
-                    "int" => { :name => :label_integer, :order => 3 },
+                    "int" => { :name => :label_integer, :order => 3 },
-                    "list" => { :name => :label_list, :order => 4 },
+                    "list" => { :name => :label_list, :order => 4 },
-			        "date" => { :name => :label_date, :order => 5 },
+			        "date" => { :name => :label_date, :order => 5 },
-			        "bool" => { :name => :label_boolean, :order => 6 }
+			        "bool" => { :name => :label_boolean, :order => 6 }
-  }.freeze
+  }.freeze
-
+
-  validates_presence_of :name, :field_format
+  validates_presence_of :name, :field_format
-  validates_uniqueness_of :name
+  validates_uniqueness_of :name
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-  validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
+  validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
-
+
-  def initialize(attributes = nil)
+  def initialize(attributes = nil)
-    super
+    super
-    self.possible_values ||= []
+    self.possible_values ||= []
+  end
+  
+  def before_validation
+    # remove empty values
+    self.possible_values = self.possible_values.collect{|v| v unless v.empty?}.compact
+  end
+  
+  def validate
+    if self.field_format == "list"
+      errors.add(:possible_values, :activerecord_error_blank) if self.possible_values.nil? || self.possible_values.empty?
+      errors.add(:possible_values, :activerecord_error_invalid) unless self.possible_values.is_a? Array
+    end
+  end
+
+  # to move in project_custom_field
+  def self.for_all
+    find(:all, :conditions => ["is_for_all=?", true])
+  end
+  
+  def type_name
+    nil
   end
-  
+end
-  def before_validation
-    # remove empty values
-    self.possible_values = self.possible_values.collect{|v| v unless v.empty?}.compact
-  end
-  
-  def validate
-    if self.field_format == "list"
-      errors.add(:possible_values, :activerecord_error_blank) if self.possible_values.nil? || self.possible_values.empty?
-      errors.add(:possible_values, :activerecord_error_invalid) unless self.possible_values.is_a? Array
-    end
-  end
-
-  # to move in project_custom_field
-  def self.for_all
-    find(:all, :conditions => ["is_for_all=?", true])
-  end
-  
-  def type_name
-    nil
-  end
-end

app/models/custom_value.rb

@@ -1,38 +1,38 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class CustomValue < ActiveRecord::Base
+class CustomValue < ActiveRecord::Base
-  belongs_to :custom_field
+  belongs_to :custom_field
-  belongs_to :customized, :polymorphic => true
+  belongs_to :customized, :polymorphic => true
-
+
-protected
+protected
-  def validate
+  def validate
-    errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.empty?    
+    errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.empty?    
-    errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
+    errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.empty? or value =~ Regexp.new(custom_field.regexp)
-    errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
+    errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
-    errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
+    errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
-    case custom_field.field_format
+    case custom_field.field_format
-    when "int"
+    when "int"
-      errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[0-9]*$/	
+      errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[0-9]*$/	
-    when "date"
+    when "date"
-      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty?
+      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty?
-    when "list"
+    when "list"
-      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty?
+      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty?
-    end
+    end
   end
-end
+end
 

app/models/document.rb

@@ -1,24 +1,24 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class Document < ActiveRecord::Base
+class Document < ActiveRecord::Base
-  belongs_to :project
+  belongs_to :project
-  belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
+  belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
-  has_many :attachments, :as => :container, :dependent => :destroy
+  has_many :attachments, :as => :container, :dependent => :destroy
-
+
   validates_presence_of :project, :title, :category
 end

app/models/enumeration.rb

@@ -1,50 +1,47 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class Enumeration < ActiveRecord::Base
+class Enumeration < ActiveRecord::Base
-  before_destroy :check_integrity
+  before_destroy :check_integrity
-  
+  
-  validates_presence_of :opt, :name
+  validates_presence_of :opt, :name
-  validates_uniqueness_of :name, :scope => [:opt]
+  validates_uniqueness_of :name, :scope => [:opt]
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-	
+	
-	OPTIONS = {
+	OPTIONS = {
-	  "IPRI" => :enumeration_issue_priorities,
+	  "IPRI" => :enumeration_issue_priorities,
-      "DCAT" => :enumeration_doc_categories,
+      "DCAT" => :enumeration_doc_categories
-      "ACTI" => :enumeration_activities
+	}.freeze
-	}.freeze
+	
-	
+	def self.get_values(option)
-	def self.get_values(option)
+		find(:all, :conditions => ['opt=?', option])
-		find(:all, :conditions => ['opt=?', option])
+	end
-	end
+	
-	
+  def option_name
-  def option_name
+    OPTIONS[self.opt]
-    OPTIONS[self.opt]
+  end
-  end
+  
-  
+private
-private
+  def check_integrity
-  def check_integrity
+    case self.opt
-    case self.opt
+    when "IPRI"
-    when "IPRI"
+      raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
-      raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
+    when "DCAT"
-    when "DCAT"
+      raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
-      raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
+    end
-    when "ACTI"
-      raise "Can't delete enumeration" if TimeEntry.find(:first, :conditions => ["activity_id=?", self.id])
-    end
   end
 end

app/models/issue.rb

@@ -1,131 +1,102 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class Issue < ActiveRecord::Base
+class Issue < ActiveRecord::Base
-  belongs_to :project
+
-  belongs_to :tracker
+  belongs_to :project
-  belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
+  belongs_to :tracker
-  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
-  belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
+  belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
-  belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
+  belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
-  belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
+  belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
-
+  belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
-  has_many :journals, :as => :journalized, :dependent => :destroy
+
-  has_many :attachments, :as => :container, :dependent => :destroy
+  has_many :journals, :as => :journalized, :dependent => :destroy
-  has_many :time_entries, :dependent => :nullify
+  has_many :attachments, :as => :container, :dependent => :destroy
-  has_many :custom_values, :dependent => :delete_all, :as => :customized
+
-  has_many :custom_fields, :through => :custom_values
+  has_many :custom_values, :dependent => :delete_all, :as => :customized
-  has_and_belongs_to_many :changesets, :order => "revision ASC"
+  has_many :custom_fields, :through => :custom_values
-  
+
-  has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
+  validates_presence_of :subject, :description, :priority, :tracker, :author, :status
-  has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
+  validates_inclusion_of :done_ratio, :in => 0..100
-  
+  validates_associated :custom_values, :on => :update
-  acts_as_watchable
+
-  
+  # set default status for new issues
-  validates_presence_of :subject, :description, :priority, :tracker, :author, :status
+  def before_validation
-  validates_inclusion_of :done_ratio, :in => 0..100
+    self.status = IssueStatus.default if new_record?
-  validates_associated :custom_values, :on => :update
+  end
-
+
-  # set default status for new issues
+  def validate
-  def before_validation
+    if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
-    self.status = IssueStatus.default if status.nil?
+      errors.add :due_date, :activerecord_error_not_a_date
-  end
+    end
-
+    
-  def validate
+    if self.due_date and self.start_date and self.due_date < self.start_date
-    if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
+      errors.add :due_date, :activerecord_error_greater_than_start_date
-      errors.add :due_date, :activerecord_error_not_a_date
+    end
-    end
+  end
-    
+
-    if self.due_date and self.start_date and self.due_date < self.start_date
+  #def before_create
-      errors.add :due_date, :activerecord_error_greater_than_start_date
+  #  build_history
-    end
+  #end
-    
+  
-    if start_date && soonest_start && start_date < soonest_start
+  def before_save
-      errors.add :start_date, :activerecord_error_invalid
+    if @current_journal
-    end
+      # attributes changes
-  end
+      (Issue.column_names - %w(id description)).each {|c|
-  
+        @current_journal.details << JournalDetail.new(:property => 'attr',
-  def before_create
+                                                      :prop_key => c,
-    # default assignment based on category
+                                                      :old_value => @issue_before_change.send(c),
-    if assigned_to.nil? && category && category.assigned_to
+                                                      :value => send(c)) unless send(c)==@issue_before_change.send(c)
-      self.assigned_to = category.assigned_to
+      }
-    end
+      # custom fields changes
-  end
+      custom_values.each {|c|
-  
+        @current_journal.details << JournalDetail.new(:property => 'cf', 
-  def before_save  
+                                                      :prop_key => c.custom_field_id,
-    if @current_journal
+                                                      :old_value => @custom_values_before_change[c.custom_field_id],
-      # attributes changes
+                                                      :value => c.value) unless @custom_values_before_change[c.custom_field_id]==c.value
-      (Issue.column_names - %w(id description)).each {|c|
+      }      
-        @current_journal.details << JournalDetail.new(:property => 'attr',
+      @current_journal.save unless @current_journal.details.empty? and @current_journal.notes.empty?
-                                                      :prop_key => c,
+    end
-                                                      :old_value => @issue_before_change.send(c),
+  end
-                                                      :value => send(c)) unless send(c)==@issue_before_change.send(c)
+  
-      }
+  def long_id
-      # custom fields changes
+    "%05d" % self.id
-      custom_values.each {|c|
+  end
-        @current_journal.details << JournalDetail.new(:property => 'cf', 
+  
-                                                      :prop_key => c.custom_field_id,
+  def custom_value_for(custom_field)
-                                                      :old_value => @custom_values_before_change[c.custom_field_id],
+    self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
-                                                      :value => c.value) unless @custom_values_before_change[c.custom_field_id]==c.value
+    return nil
-      }      
+  end
-      @current_journal.save unless @current_journal.details.empty? and @current_journal.notes.empty?
+  
-    end
+  def init_journal(user, notes = "")
-  end
+    @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
-  
+    @issue_before_change = self.clone
-  def after_save
+    @custom_values_before_change = {}
-    relations_from.each(&:set_issue_to_dates)
+    self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
-  end
+    @current_journal
-  
+  end
-  def custom_value_for(custom_field)
+
-    self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
+private
-    return nil
+  # Creates an history for the issue
-  end
+  #def build_history
-  
+  #  @history = self.histories.build
-  def init_journal(user, notes = "")
+  #  @history.status = self.status
-    @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
+  #  @history.author = self.author
-    @issue_before_change = self.clone
+  #end
-    @custom_values_before_change = {}
-    self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
-    @current_journal
-  end
-  
-  def spent_hours
-    @spent_hours ||= time_entries.sum(:hours) || 0
-  end
-  
-  def relations
-    (relations_from + relations_to).sort
-  end
-  
-  def all_dependent_issues
-    dependencies = []
-    relations_from.each do |relation|
-      dependencies << relation.issue_to
-      dependencies += relation.issue_to.all_dependent_issues
-    end
-    dependencies
-  end
-  
-  def duration
-    (start_date && due_date) ? due_date - start_date : 0
-  end
-  
-  def soonest_start
-    @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
-  end
 end

app/models/issue_category.rb

@@ -1,30 +1,29 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class IssueCategory < ActiveRecord::Base
+class IssueCategory < ActiveRecord::Base
-  before_destroy :check_integrity  
+  before_destroy :check_integrity  
-  belongs_to :project
+  belongs_to :project
-  belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
+
-
+  validates_presence_of :name
-  validates_presence_of :name
+  validates_uniqueness_of :name, :scope => [:project_id]
-  validates_uniqueness_of :name, :scope => [:project_id]
+  
-  
+private
-private
+  def check_integrity
-  def check_integrity
+    raise "Can't delete category" if Issue.find(:first, :conditions => ["category_id=?", self.id])
-    raise "Can't delete category" if Issue.find(:first, :conditions => ["category_id=?", self.id])
   end
 end

app/models/issue_custom_field.rb

@@ -1,27 +1,27 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class IssueCustomField < CustomField
+class IssueCustomField < CustomField
-  has_and_belongs_to_many :projects, :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :foreign_key => "custom_field_id"
+  has_and_belongs_to_many :projects, :join_table => "custom_fields_projects", :foreign_key => "custom_field_id"
-  has_and_belongs_to_many :trackers, :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :foreign_key => "custom_field_id"
+  has_and_belongs_to_many :trackers, :join_table => "custom_fields_trackers", :foreign_key => "custom_field_id"
-  has_many :issues, :through => :issue_custom_values
+  has_many :issues, :through => :issue_custom_values
-    
+    
-  def type_name
+  def type_name
-    :label_issue_plural
+    :label_issue_plural
-  end
+  end
-end
+end
 

app/models/issue_history.rb

@@ -1,30 +1,24 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-module TimelogHelper
+class IssueHistory < ActiveRecord::Base
-  def select_hours(data, criteria, value)
+	belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
-    data.select {|row| row[criteria] == value.to_s}
+	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  end
+	belongs_to :issue
-  
+	
-  def sum_hours(data)
+	validates_presence_of :status
-    sum = 0
-    data.each do |row|
-      sum += row['hours'].to_f
-    end
-    sum
-  end
 end

app/models/issue_relation.rb

@@ -1,79 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class IssueRelation < ActiveRecord::Base
-  belongs_to :issue_from, :class_name => 'Issue', :foreign_key => 'issue_from_id'
-  belongs_to :issue_to, :class_name => 'Issue', :foreign_key => 'issue_to_id'
-  
-  TYPE_RELATES      = "relates"
-  TYPE_DUPLICATES   = "duplicates"
-  TYPE_BLOCKS       = "blocks"
-  TYPE_PRECEDES     = "precedes"
-  
-  TYPES = { TYPE_RELATES =>     { :name => :label_relates_to, :sym_name => :label_relates_to, :order => 1 },
-            TYPE_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicates, :order => 2 },
-            TYPE_BLOCKS =>      { :name => :label_blocks, :sym_name => :label_blocked_by, :order => 3 },
-            TYPE_PRECEDES =>    { :name => :label_precedes, :sym_name => :label_follows, :order => 4 },
-          }.freeze
-  
-  validates_presence_of :issue_from, :issue_to, :relation_type
-  validates_inclusion_of :relation_type, :in => TYPES.keys
-  validates_numericality_of :delay, :allow_nil => true
-  validates_uniqueness_of :issue_to_id, :scope => :issue_from_id
-  
-  def validate
-    if issue_from && issue_to
-      errors.add :issue_to_id, :activerecord_error_invalid if issue_from_id == issue_to_id
-      errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id
-      errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from
-    end
-  end
-  
-  def other_issue(issue)
-    (self.issue_from_id == issue.id) ? issue_to : issue_from
-  end
-  
-  def label_for(issue)
-    TYPES[relation_type] ? TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] : :unknow
-  end
-  
-  def before_save
-    if TYPE_PRECEDES == relation_type
-      self.delay ||= 0
-    else
-      self.delay = nil
-    end
-    set_issue_to_dates
-  end
-  
-  def set_issue_to_dates
-    soonest_start = self.successor_soonest_start
-    if soonest_start && (!issue_to.start_date || issue_to.start_date < soonest_start)
-      issue_to.start_date, issue_to.due_date = successor_soonest_start, successor_soonest_start + issue_to.duration
-      issue_to.save
-    end
-  end
-  
-  def successor_soonest_start
-    return nil unless (TYPE_PRECEDES == self.relation_type) && (issue_from.start_date || issue_from.due_date)
-    (issue_from.due_date || issue_from.start_date) + 1 + delay
-  end
-  
-  def <=>(relation)
-    TYPES[self.relation_type][:order] <=> TYPES[relation.relation_type][:order]
-  end
-end

app/models/issue_status.rb

@@ -1,58 +1,51 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class IssueStatus < ActiveRecord::Base
+class IssueStatus < ActiveRecord::Base
-  before_destroy :check_integrity  
+  before_destroy :check_integrity  
-  has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all
+  has_many :workflows, :foreign_key => "old_status_id"
-  acts_as_list
+  acts_as_list
-
+
-  validates_presence_of :name
+  validates_presence_of :name
-  validates_uniqueness_of :name
+  validates_uniqueness_of :name
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-  validates_length_of :html_color, :is => 6
+  validates_length_of :html_color, :is => 6
-  validates_format_of :html_color, :with => /^[a-f0-9]*$/i
+  validates_format_of :html_color, :with => /^[a-f0-9]*$/i
-
+
-  def before_save
+  def before_save
-    IssueStatus.update_all "is_default=#{connection.quoted_false}" if self.is_default?
+    IssueStatus.update_all "is_default=#{connection.quoted_false}" if self.is_default?
-  end  
+  end  
-  
+  
-  # Returns the default status for new issues
+  # Returns the default status for new issues
-  def self.default
+  def self.default
-    find(:first, :conditions =>["is_default=?", true])
+    find(:first, :conditions =>["is_default=?", true])
-  end
+  end
-
+
-  # Returns an array of all statuses the given role can switch to
+  # Returns an array of all statuses the given role can switch to
-  # Uses association cache when called more than one time
+  def new_statuses_allowed_to(role, tracker)
-  def new_statuses_allowed_to(role, tracker)
+    statuses = []
-    new_statuses = workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker
+    for workflow in self.workflows
-    new_statuses ? new_statuses.compact.sort{|x, y| x.position <=> y.position } : []
+      statuses << workflow.new_status if workflow.role_id == role.id and workflow.tracker_id == tracker.id
-  end
+    end unless role.nil? or tracker.nil?
-  
+    statuses
-  # Same thing as above but uses a database query
+  end
-  # More efficient than the previous method if called just once
+  
-  def find_new_statuses_allowed_to(role, tracker)  
+private
-    new_statuses = workflows.find(:all, 
+  def check_integrity
-                                   :include => :new_status,
+    raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id])
-                                   :conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status }.compact  if role && tracker
-    new_statuses ? new_statuses.sort{|x, y| x.position <=> y.position } : []
-  end
-  
-private
-  def check_integrity
-    raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id])
   end
 end

app/models/journal.rb

@@ -17,10 +17,6 @@
 
 class Journal < ActiveRecord::Base
   belongs_to :journalized, :polymorphic => true
-  # added as a quick fix to allow eager loading of the polymorphic association
-  # since always associated to an issue, for now
-  belongs_to :issue, :foreign_key => :journalized_id
-  
   belongs_to :user
   has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
 end

app/models/journal_detail.rb

@@ -17,9 +17,4 @@
 
 class JournalDetail < ActiveRecord::Base
   belongs_to :journal
-  
-  def before_save
-    self.value = value[0..254] if value && value.is_a?(String)
-    self.old_value = old_value[0..254] if old_value && old_value.is_a?(String)
-  end
 end

app/models/mail_handler.rb

@@ -1,40 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class MailHandler < ActionMailer::Base
-  
-  # Processes incoming emails
-  # Currently, it only supports adding a note to an existing issue
-  # by replying to the initial notification message
-  def receive(email)
-    # find related issue by parsing the subject
-    m = email.subject.match %r{\[.*#(\d+)\]}
-    return unless m
-    issue = Issue.find_by_id(m[1])
-    return unless issue
-    
-    # find user
-    user = User.find_active(:first, :conditions => {:mail => email.from.first})
-    return unless user
-    # check permission
-    return unless Permission.allowed_to_role("issues/add_note", user.role_for_project(issue.project))
-    
-    # add the note
-    issue.init_journal(user, email.body.chomp)
-    issue.save
-  end
-end

app/models/mailer.rb

@@ -1,116 +1,88 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class Mailer < ActionMailer::Base
+class Mailer < ActionMailer::Base
   helper IssuesHelper
-  
-  def account_information(user, password)
-    set_language_if_valid user.language
-    recipients user.mail
-    from Setting.mail_from
-    subject l(:mail_subject_register)
-    body :user => user, :password => password
-  end
 
-  def issue_add(issue)
+  def issue_add(issue)
     set_language_if_valid(Setting.default_language)
     # Sends to all project members
     @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }.compact
-    # Sends to author and assignee (even if they turned off mail notification)
-    @recipients     << issue.author.mail if issue.author
-    @recipients     << issue.assigned_to.mail if issue.assigned_to
-    @recipients.compact!
-    @recipients.uniq!
     @from           = Setting.mail_from
     @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
-    @body['issue']  = issue
+    @body['issue']  = issue
-  end
+  end
-
+
-  def issue_edit(journal)
+  def issue_edit(journal)
-    set_language_if_valid(Setting.default_language)
+    set_language_if_valid(Setting.default_language)
-    # Sends to all project members
+    # Sends to all project members
-    issue = journal.journalized
+    issue = journal.journalized
-    @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
+    @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }.compact
-    # Sends to author and assignee (even if they turned off mail notification)
+    @from           = Setting.mail_from
-    @recipients     << issue.author.mail if issue.author
+    @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
-    @recipients     << issue.assigned_to.mail if issue.assigned_to
+    @body['issue']  = issue
-    @recipients.compact!
+    @body['journal']= journal
-    @recipients.uniq!
+  end
-    # Watchers in cc
+  
-    @cc             = issue.watcher_recipients - @recipients
+  def document_add(document)
-    @from           = Setting.mail_from
+    set_language_if_valid(Setting.default_language)
-    @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
+    @recipients     = document.project.users.collect { |u| u.mail if u.mail_notification }.compact
-    @body['issue']  = issue
+    @from           = Setting.mail_from
-    @body['journal']= journal
+    @subject        = "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
-  end
+    @body['document'] = document
-  
+  end
-  def document_add(document)
+  
-    set_language_if_valid(Setting.default_language)
+  def attachments_add(attachments)
-    @recipients     = document.project.users.collect { |u| u.mail if u.mail_notification }.compact
+    set_language_if_valid(Setting.default_language)
-    @from           = Setting.mail_from
+    container = attachments.first.container
-    @subject        = "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
+    url = "http://#{Setting.host_name}/"
-    @body['document'] = document
+    added_to = ""
-  end
+    case container.class.to_s
-  
+    when 'Version'
-  def attachments_add(attachments)
+      url << "projects/list_files/#{container.project_id}"
-    set_language_if_valid(Setting.default_language)
+      added_to = "#{l(:label_version)}: #{container.name}"
-    container = attachments.first.container
+    when 'Document'
-    url = "http://#{Setting.host_name}/"
+      url << "documents/show/#{container.id}"
-    added_to = ""
+      added_to = "#{l(:label_document)}: #{container.title}"
-    case container.class.to_s
+    when 'Issue'
-    when 'Version'
+      url << "issues/show/#{container.id}"
-      url << "projects/list_files/#{container.project_id}"
+      added_to = "#{container.tracker.name} ##{container.id}: #{container.subject}"
-      added_to = "#{l(:label_version)}: #{container.name}"
+    end
-    when 'Document'
+    @recipients     = container.project.users.collect { |u| u.mail if u.mail_notification }.compact
-      url << "documents/show/#{container.id}"
+    @from           = Setting.mail_from
-      added_to = "#{l(:label_document)}: #{container.title}"
+    @subject        = "[#{container.project.name}] #{l(:label_attachment_new)}"
-    when 'Issue'
+    @body['attachments'] = attachments
-      url << "issues/show/#{container.id}"
+    @body['url']    = url
-      added_to = "#{container.tracker.name} ##{container.id}: #{container.subject}"
+    @body['added_to'] = added_to
-    end
+  end
-    @recipients     = container.project.users.collect { |u| u.mail if u.mail_notification }.compact
+  
-    @from           = Setting.mail_from
+  def lost_password(token)
-    @subject        = "[#{container.project.name}] #{l(:label_attachment_new)}"
+    set_language_if_valid(token.user.language)
-    @body['attachments'] = attachments
+    @recipients     = token.user.mail
-    @body['url']    = url
+    @from           = Setting.mail_from
-    @body['added_to'] = added_to
+    @subject        = l(:mail_subject_lost_password)
-  end
+    @body['token']  = token
-  
-  def lost_password(token)
-    set_language_if_valid(token.user.language)
-    @recipients     = token.user.mail
-    @from           = Setting.mail_from
-    @subject        = l(:mail_subject_lost_password)
-    @body['token']  = token
   end  
-
+
-  def register(token)
+  def register(token)
-    set_language_if_valid(token.user.language)
+    set_language_if_valid(token.user.language)
-    @recipients     = token.user.mail
+    @recipients     = token.user.mail
-    @from           = Setting.mail_from
+    @from           = Setting.mail_from
-    @subject        = l(:mail_subject_register)
+    @subject        = l(:mail_subject_register)
-    @body['token']  = token
+    @body['token']  = token
-  end
+  end
-  
-  def message_posted(message, recipients)
-    set_language_if_valid(Setting.default_language)
-    @recipients     = recipients
-    @from           = Setting.mail_from
-    @subject        = "[#{message.board.project.name} - #{message.board.name}] #{message.subject}"
-    @body['message'] = message
-  end
 end

app/models/member.rb

@@ -1,34 +1,29 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class Member < ActiveRecord::Base
+class Member < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :user
-  belongs_to :role
+  belongs_to :role
-  belongs_to :project
+  belongs_to :project
-
+
-  validates_presence_of :role, :user, :project
+  validates_presence_of :role, :user, :project
-  validates_uniqueness_of :user_id, :scope => :project_id
+  validates_uniqueness_of :user_id, :scope => :project_id
-
+
-  def name
+  def name
-    self.user.name
+    self.user.display_name
-  end
-  
-  def before_destroy
-    # remove category based auto assignments for this member
-    project.issue_categories.update_all "assigned_to_id = NULL", ["assigned_to_id = ?", self.user.id]
   end
 end

app/models/message.rb

@@ -1,41 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class Message < ActiveRecord::Base
-  belongs_to :board
-  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
-  has_many :attachments, :as => :container, :dependent => :destroy
-  belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
-  
-  validates_presence_of :subject, :content
-  validates_length_of :subject, :maximum => 255
-  
-  def after_create
-    board.update_attribute(:last_message_id, self.id)
-    board.increment! :messages_count
-    if parent
-      parent.reload.update_attribute(:last_reply_id, self.id)
-    else
-      board.increment! :topics_count
-    end
-  end
-  
-  def project
-    board.project
-  end
-end

app/models/message_observer.rb

@@ -1,24 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class MessageObserver < ActiveRecord::Observer
-  def after_create(message)
-    # send notification to board watchers
-    recipients = message.board.watcher_recipients
-    Mailer.deliver_message_posted(message, recipients) unless recipients.empty?
-  end
-end

app/models/news.rb

@@ -1,29 +1,29 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class News < ActiveRecord::Base
+class News < ActiveRecord::Base
-  belongs_to :project
+  belongs_to :project
-  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
+  has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
-  
+  
-  validates_presence_of :title, :description
+  validates_presence_of :title, :description
-  
+  
-  # returns latest news for projects visible by user
+  # returns latest news for projects visible by user
-  def self.latest(user=nil, count=5)
+  def self.latest(user=nil, count=5)
-    find(:all, :limit => count, :conditions => Project.visible_by(user), :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")	
+    find(:all, :limit => count, :conditions => Project.visible_by(user), :include => [ :author, :project ], :order => "news.created_on DESC")	
   end
 end

app/models/permission.rb

@@ -1,68 +1,65 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class Permission < ActiveRecord::Base
+class Permission < ActiveRecord::Base
-  has_and_belongs_to_many :roles
+  has_and_belongs_to_many :roles
-
+
-  validates_presence_of :controller, :action, :description
+  validates_presence_of :controller, :action, :description
-
+
-  GROUPS = {
+  GROUPS = {
-    100 => :label_project,
+    100 => :label_project,
-    200 => :label_member_plural,
+    200 => :label_member_plural,
-    300 => :label_version_plural,
+    300 => :label_version_plural,
-    400 => :label_issue_category_plural,
+    400 => :label_issue_category_plural,
-    600 => :label_query_plural,
+    600 => :label_query_plural,
-    1000 => :label_issue_plural,
+    1000 => :label_issue_plural,
-    1100 => :label_news_plural,
+    1100 => :label_news_plural,
-    1200 => :label_document_plural,
+    1200 => :label_document_plural,
-    1300 => :label_attachment_plural,
+    1300 => :label_attachment_plural,
-    1400 => :label_repository,
+    1400 => :label_repository
-    1500 => :label_time_tracking,
+  }.freeze
-    1700 => :label_wiki_page_plural,
+  
-    2000 => :label_board_plural
+  @@cached_perms_for_public = nil
-  }.freeze
+  @@cached_perms_for_roles = nil
-  
+  
-  @@cached_perms_for_public = nil
+  def name
-  @@cached_perms_for_roles = nil
+    self.controller + "/" + self.action
-  
+  end
-  def name
+  
-    self.controller + "/" + self.action
+  def group_id
-  end
+    (self.sort / 100)*100
-  
+  end
-  def group_id
+  
-    (self.sort / 100)*100
+  def self.allowed_to_public(action)
-  end
+    @@cached_perms_for_public ||= find(:all, :conditions => ["is_public=?", true]).collect {|p| "#{p.controller}/#{p.action}"}
-  
+    @@cached_perms_for_public.include? action
-  def self.allowed_to_public(action)
+  end
-    @@cached_perms_for_public ||= find(:all, :conditions => ["is_public=?", true]).collect {|p| "#{p.controller}/#{p.action}"}
+  
-    @@cached_perms_for_public.include? action
+  def self.allowed_to_role(action, role)
-  end
+    @@cached_perms_for_roles ||=
-  
+      begin
-  def self.allowed_to_role(action, role)
+        perms = {}
-    @@cached_perms_for_roles ||=
+        find(:all, :include => :roles).each {|p| perms.store "#{p.controller}/#{p.action}", p.roles.collect {|r| r.id } }
-      begin
+        perms
-        perms = {}
+      end
-        find(:all, :include => :roles).each {|p| perms.store "#{p.controller}/#{p.action}", p.roles.collect {|r| r.id } }
+    allowed_to_public(action) or (@@cached_perms_for_roles[action] and @@cached_perms_for_roles[action].include? role)
-        perms
+  end
-      end
+  
-    allowed_to_public(action) or (role && @@cached_perms_for_roles[action] && @@cached_perms_for_roles[action].include?(role.id))
+  def self.allowed_to_role_expired
-  end
+    @@cached_perms_for_roles = nil
-  
-  def self.allowed_to_role_expired
-    @@cached_perms_for_roles = nil
   end
 end

app/models/project.rb

@@ -1,123 +1,70 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class Project < ActiveRecord::Base
+class Project < ActiveRecord::Base
-  # Project statuses
+  has_many :versions, :dependent => :destroy, :order => "versions.effective_date DESC, versions.name DESC"
-  STATUS_ACTIVE     = 1
+  has_many :members, :dependent => :delete_all, :include => :user, :conditions => "users.status=#{User::STATUS_ACTIVE}"
-  STATUS_ARCHIVED   = 9
+  has_many :users, :through => :members
-  
+  has_many :custom_values, :dependent => :delete_all, :as => :customized
-  has_many :members, :dependent => :delete_all, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
+  has_many :issues, :dependent => :destroy, :order => "issues.created_on DESC", :include => [:status, :tracker]
-  has_many :users, :through => :members
+  has_many :queries, :dependent => :delete_all
-  has_many :custom_values, :dependent => :delete_all, :as => :customized
+  has_many :documents, :dependent => :destroy
-  has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
+  has_many :news, :dependent => :delete_all, :include => :author
-  has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
+  has_many :issue_categories, :dependent => :delete_all, :order => "issue_categories.name"
-  has_many :time_entries, :dependent => :delete_all
+  has_one :repository, :dependent => :destroy
-  has_many :queries, :dependent => :delete_all
+  has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_projects', :association_foreign_key => 'custom_field_id'
-  has_many :documents, :dependent => :destroy
+  acts_as_tree :order => "name", :counter_cache => true
-  has_many :news, :dependent => :delete_all, :include => :author
+
-  has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
+  validates_presence_of :name, :description
-  has_many :boards, :order => "position ASC"
+  validates_uniqueness_of :name
-  has_one :repository, :dependent => :destroy
+  validates_associated :custom_values, :on => :update
-  has_one :wiki, :dependent => :destroy
+  validates_associated :repository
-  has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
+  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-  acts_as_tree :order => "name", :counter_cache => true
+
-  
+  # returns latest created projects
-  attr_protected :status
+  # non public projects will be returned only if user is a member of those
-  
+  def self.latest(user=nil, count=5)
-  validates_presence_of :name, :description, :identifier
+    find(:all, :limit => count, :conditions => visible_by(user), :order => "projects.created_on DESC")	
-  validates_uniqueness_of :name, :identifier
+  end	
-  validates_associated :custom_values, :on => :update
+
-  validates_associated :repository, :wiki
+  def self.visible_by(user=nil)
-  validates_length_of :name, :maximum => 30
+    if user && !user.memberships.empty?
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+      return ["projects.is_public = ? or projects.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')})", true]
-  validates_length_of :description, :maximum => 255
+    else
-  validates_length_of :identifier, :in => 3..12
+      return ["projects.is_public = ?", true]
-  validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
+    end
-  
+  end
-  def identifier=(identifier)
+  
-    super unless identifier_frozen?
+  # Returns an array of all custom fields enabled for project issues
-  end
+  # (explictly associated custom fields and custom fields enabled for all projects)
-  
+  def custom_fields_for_issues(tracker)
-  def identifier_frozen?
+    tracker.custom_fields.find(:all, :include => :projects, 
-    errors[:identifier].nil? && !(new_record? || identifier.blank?)
+                               :conditions => ["is_for_all=? or project_id=?", true, self.id])
-  end
+    #(CustomField.for_all + custom_fields).uniq
-  
+  end
-  def issues_with_subprojects(include_subprojects=false)
+  
-    conditions = nil
+  def all_custom_fields
-    if include_subprojects && !active_children.empty?
+    @all_custom_fields ||= IssueCustomField.find(:all, :include => :projects, 
-      ids = [id] + active_children.collect {|c| c.id}
+                               :conditions => ["is_for_all=? or project_id=?", true, self.id])
-      conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
+  end
-    end
+
-    conditions ||= ["#{Issue.table_name}.project_id = ?", id]
+protected
-    Issue.with_scope :find => { :conditions => conditions } do 
+  def validate
-      yield
+    errors.add(parent_id, " must be a root project") if parent and parent.parent
-    end 
+    errors.add_to_base("A project with subprojects can't be a subproject") if parent and children.size > 0
-  end
-  
-  # returns latest created projects
-  # non public projects will be returned only if user is a member of those
-  def self.latest(user=nil, count=5)
-    find(:all, :limit => count, :conditions => visible_by(user), :order => "created_on DESC")	
-  end	
-
-  def self.visible_by(user=nil)
-    if user && user.admin?
-      return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
-    elsif user && user.memberships.any?
-      return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = ? or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))", true]
-    else
-      return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = ?", true]
-    end
-  end
-  
-  def active?
-    self.status == STATUS_ACTIVE
-  end
-  
-  def archive
-    # Archive subprojects if any
-    children.each do |subproject|
-      subproject.archive
-    end
-    update_attribute :status, STATUS_ARCHIVED
-  end
-  
-  def unarchive
-    return false if parent && !parent.active?
-    update_attribute :status, STATUS_ACTIVE
-  end
-  
-  def active_children
-    children.select {|child| child.active?}
-  end
-  
-  # Returns an array of all custom fields enabled for project issues
-  # (explictly associated custom fields and custom fields enabled for all projects)
-  def custom_fields_for_issues(tracker)
-    all_custom_fields.select {|c| tracker.custom_fields.include? c }
-  end
-  
-  def all_custom_fields
-    @all_custom_fields ||= (IssueCustomField.for_all + custom_fields).uniq
-  end
-
-protected
-  def validate
-    errors.add(parent_id, " must be a root project") if parent and parent.parent
-    errors.add_to_base("A project with subprojects can't be a subproject") if parent and children.size > 0
   end
 end

app/models/project_custom_field.rb

@@ -1,22 +1,22 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class ProjectCustomField < CustomField
+class ProjectCustomField < CustomField
-  def type_name
+  def type_name
-    :label_project_plural
+    :label_project_plural
-  end
+  end
-end
+end

app/models/query.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  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
@@ -21,7 +21,6 @@ class Query < ActiveRecord::Base
   serialize :filters
   
   attr_protected :project, :user
-  attr_accessor :executed_by
   
   validates_presence_of :name, :on => :save
     
@@ -46,10 +45,8 @@ class Query < ActiveRecord::Base
   @@operators_by_filter_type = { :list => [ "=", "!" ],
                                  :list_status => [ "o", "=", "!", "c", "*" ],
                                  :list_optional => [ "=", "!", "!*", "*" ],
-                                 :list_one_or_more => [ "*", "=" ],
                                  :date => [ "<t+", ">t+", "t+", "t", ">t-", "<t-", "t-" ],
                                  :date_past => [ ">t-", "<t-", "t-", "t" ],
-                                 :string => [ "=", "~", "!", "!~" ],
                                  :text => [  "~", "!~" ] }
 
   cattr_reader :operators_by_filter_type
@@ -57,16 +54,12 @@ class Query < ActiveRecord::Base
   def initialize(attributes = nil)
     super attributes
     self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-  end
+    self.is_public = true
-  
-  def executed_by=(user)
-    @executed_by = user
-    set_language_if_valid(user.language) if user
   end
   
   def validate
     filters.each_key do |field|
-      errors.add label_for(field), :activerecord_error_blank unless 
+      errors.add field.gsub(/\_id$/, ""), :activerecord_error_blank unless 
           # filter requires one or more values
           (values_for(field) and !values_for(field).first.empty?) or 
           # filter doesn't require any value
@@ -74,12 +67,6 @@ class Query < ActiveRecord::Base
     end if filters
   end
   
-  def editable_by?(user)
-    return false unless user
-    return true if !is_public && self.user_id == user.id
-    is_public && user.authorized_to(project, "projects/add_query")
-  end
-  
   def available_filters
     return @available_filters if @available_filters
     @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },       
@@ -92,32 +79,10 @@ class Query < ActiveRecord::Base
                            "due_date" => { :type => :date, :order => 12 } }                          
     unless project.nil?
       # project specific filters
-      user_values = []
+      @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
-      user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
+      @available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
-      user_values += @project.users.collect{|s| [s.name, s.id.to_s] }
-      
-      @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values }  
-      @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values }  
       @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
-      @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
+      @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.collect{|s| [s.name, s.id.to_s] } }
-      unless @project.active_children.empty?
-        @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
-      end
-      @project.all_custom_fields.select(&:is_filter?).each do |field|
-        case field.field_format
-        when "string", "int"
-          options = { :type => :string, :order => 20 }
-        when "text"
-          options = { :type => :text, :order => 20 }
-        when "list"
-          options = { :type => :list_optional, :values => field.possible_values, :order => 20}
-        when "date"
-          options = { :type => :date, :order => 20 }
-        when "bool"
-          options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
-        end          
-        @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
-      end
       # remove category filter if no category defined
       @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
     end
@@ -157,82 +122,45 @@ class Query < ActiveRecord::Base
     has_filter?(field) ? filters[field][:values] : nil
   end
   
-  def label_for(field)
-    label = @available_filters[field][:name] if @available_filters.has_key?(field)
-    label ||= field.gsub(/\_id$/, "")
-  end
-  
   def statement
-    sql = "1=1"
+    sql = "1=1" 
-    if has_filter?("subproject_id")
+    sql << " AND issues.project_id=%d" % project.id if project
-      subproject_ids = []
-      if operator_for("subproject_id") == "="
-        subproject_ids = values_for("subproject_id").each(&:to_i)
-      else
-        subproject_ids = project.active_children.collect{|p| p.id}
-      end
-      sql << " AND #{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
-    else
-      sql << " AND #{Issue.table_name}.project_id=%d" % project.id if project
-    end
     filters.each_key do |field|
-      next if field == "subproject_id"
+      v = values_for field
-      v = values_for(field).clone
+      next unless v and !v.empty?  
-      next unless v and !v.empty?
-        
       sql = sql + " AND " unless sql.empty?      
-      sql << "("
-      
-      if field =~ /^cf_(\d+)$/
-        # custom field
-        db_table = CustomValue.table_name
-        db_field = "value"
-        sql << "#{db_table}.custom_field_id = #{$1} AND "
-      else
-        # regular field
-        db_table = Issue.table_name
-        db_field = field
-      end
-      
-      # "me" value subsitution
-      if %w(assigned_to_id author_id).include?(field)
-        v.push(executed_by ? executed_by.id.to_s : "0") if v.delete("me")
-      end
-      
       case operator_for field
       when "="
-        sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
+        sql = sql + "issues.#{field} IN (" + v.each(&:to_i).join(",") + ")"
       when "!"
-        sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
+        sql = sql + "issues.#{field} NOT IN (" + v.each(&:to_i).join(",") + ")"
       when "!*"
-        sql = sql + "#{db_table}.#{db_field} IS NULL"
+        sql = sql + "issues.#{field} IS NULL"
       when "*"
-        sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
+        sql = sql + "issues.#{field} IS NOT NULL"
       when "o"
-        sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
+        sql = sql + "issue_statuses.is_closed=#{connection.quoted_false}" if field == "status_id"
       when "c"
-        sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
+        sql = sql + "issue_statuses.is_closed=#{connection.quoted_true}" if field == "status_id"
       when ">t-"
-        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)]
+        sql = sql + "issues.#{field} >= '%s'" % connection.quoted_date(Date.today - v.first.to_i)
       when "<t-"
-        sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)
+        sql = sql + "issues.#{field} <= '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
       when "t-"
-        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today - v.first.to_i + 1).to_time)]
+        sql = sql + "issues.#{field} = '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
       when ">t+"
-        sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)
+        sql = sql + "issues.#{field} >= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
       when "<t+"
-        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
+        sql = sql + "issues.#{field} <= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
       when "t+"
-        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
+        sql = sql + "issues.#{field} = '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
       when "t"
-        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]
+        sql = sql + "issues.#{field} = '%s'" % connection.quoted_date(Date.today)
       when "~"
-        sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
+        sql = sql + "issues.#{field} LIKE '%#{connection.quote_string(v.first)}%'"
       when "!~"
-        sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
+        sql = sql + "issues.#{field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
       end
-      sql << ")"
-      
     end if filters and valid?
     sql
   end

app/models/repository.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  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
@@ -17,63 +17,12 @@
 
 class Repository < ActiveRecord::Base
   belongs_to :project
-  has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.revision DESC"
+  validates_presence_of :url
-  has_many :changes, :through => :changesets
+  validates_format_of :url, :with => /^(http|https|svn|file):\/\/.+/i
+  
+  @scm = nil
     
   def scm
-    @scm ||= self.scm_adapter.new url, root_url, login, password
+    @scm ||= SvnRepos::Base.new url
-    update_attribute(:root_url, @scm.root_url) if root_url.blank?
-    @scm
-  end
-  
-  def scm_name
-    self.class.scm_name
-  end
-  
-  def supports_cat?
-    scm.supports_cat?
-  end
-  
-  def entries(path=nil, identifier=nil)
-    scm.entries(path, identifier)
-  end
-  
-  def diff(path, rev, rev_to, type)
-    scm.diff(path, rev, rev_to, type)
-  end
-  
-  def latest_changeset
-    @latest_changeset ||= changesets.find(:first)
-  end
-    
-  def scan_changesets_for_issue_ids
-    self.changesets.each(&:scan_comment_for_issue_ids)
-  end
-  
-  # fetch new changesets for all repositories
-  # can be called periodically by an external script
-  # eg. ruby script/runner "Repository.fetch_changesets"
-  def self.fetch_changesets
-    find(:all).each(&:fetch_changesets)
-  end
-  
-  # scan changeset comments to find related and fixed issues for all repositories
-  def self.scan_changesets_for_issue_ids
-    find(:all).each(&:scan_changesets_for_issue_ids)
-  end
-
-  def self.scm_name
-    'Abstract'
-  end
-  
-  def self.available_scm
-    subclasses.collect {|klass| [klass.scm_name, klass.name]}
-  end
-  
-  def self.factory(klass_name, *args)
-    klass = "Repository::#{klass_name}".constantize
-    klass.new(*args)
-  rescue
-    nil
   end
 end

app/models/repository/cvs.rb

@@ -1,150 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-require 'redmine/scm/adapters/cvs_adapter'
-require 'digest/sha1'
-
-class Repository::Cvs < Repository
-  validates_presence_of :url, :root_url
-
-  def scm_adapter
-    Redmine::Scm::Adapters::CvsAdapter
-  end
-  
-  def self.scm_name
-    'CVS'
-  end
-  
-  def entry(path, identifier)
-    e = entries(path, identifier)
-    e ? e.first : nil
-  end
-  
-  def entries(path=nil, identifier=nil)
-    entries=scm.entries(path, identifier)
-    if entries
-      entries.each() do |entry|
-        unless entry.lastrev.nil? || entry.lastrev.identifier
-          change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) )
-          if change
-            entry.lastrev.identifier=change.changeset.revision
-            entry.lastrev.author=change.changeset.committer
-            entry.lastrev.revision=change.revision
-            entry.lastrev.branch=change.branch
-          end
-        end
-      end
-    end
-    entries
-  end
-  
-  def diff(path, rev, rev_to, type)
-    #convert rev to revision. CVS can't handle changesets here
-    diff=[]
-    changeset_from=changesets.find_by_revision(rev)
-    if rev_to.to_i > 0 
-      changeset_to=changesets.find_by_revision(rev_to)
-    end
-    changeset_from.changes.each() do |change_from|
-      
-      revision_from=nil
-      revision_to=nil      
-      
-      revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
-      
-      if revision_from
-        if changeset_to
-          changeset_to.changes.each() do |change_to|
-            revision_to=change_to.revision if change_to.path==change_from.path 
-          end
-        end
-        unless revision_to
-          revision_to=scm.get_previous_revision(revision_from)
-        end
-        diff=diff+scm.diff(change_from.path, revision_from, revision_to, type)
-      end
-    end
-    return diff
-  end
-  
-  def fetch_changesets
-    #not the preferred way with CVS. maybe we should introduce always a cron-job for this
-    last_commit = changesets.maximum(:committed_on)
-    
-    # some nifty bits to introduce a commit-id with cvs
-    # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
-    # we now take a guess using the author, the commitlog and the commit-date.
-    
-    # last one is the next step to take. the commit-date is not equal for all 
-    # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
-    # we use a small delta here, to merge all changes belonging to _one_ changeset
-    time_delta=10.seconds
-    
-    transaction do
-      scm.revisions('', last_commit, nil, :with_paths => true) do |revision|
-        # only add the change to the database, if it doen't exists. the cvs log
-        # is not exclusive at all. 
-        unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
-          revision
-          cs=Changeset.find(:first, :conditions=>{
-            :committed_on=>revision.time-time_delta..revision.time+time_delta,
-            :committer=>revision.author,
-            :comments=>revision.message
-          })
-        
-          # create a new changeset.... 
-          unless cs 
-            # we use a negative changeset-number here (just for inserting)
-            # later on, we calculate a continous positive number
-            next_rev = changesets.minimum(:revision)            
-            next_rev = 0 if next_rev.nil? or next_rev > 0 
-            next_rev = next_rev - 1
-            
-            cs=Changeset.create(:repository => self,
-            :revision => next_rev, 
-            :committer => revision.author, 
-            :committed_on => revision.time,
-            :comments => revision.message)
-          end
-        
-          #convert CVS-File-States to internal Action-abbrevations
-          #default action is (M)odified
-          action="M"
-          if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1"
-            action="A" #add-action always at first revision (= 1.1)
-          elsif revision.paths[0][:action]=="dead"
-            action="D" #dead-state is similar to Delete
-          end
-        
-          Change.create(:changeset => cs,
-          :action => action,
-          :path => scm.with_leading_slash(revision.paths[0][:path]),
-          :revision => revision.paths[0][:revision],
-          :branch => revision.paths[0][:branch]
-          )
-        end
-      end
-      
-      next_rev = [changesets.maximum(:revision) || 0, 0].max
-      changesets.find(:all, :conditions=>["revision < 0"], :order=>"committed_on ASC").each() do |changeset|
-        next_rev = next_rev + 1
-        changeset.revision = next_rev
-        changeset.save!
-      end
-    end
-  end
-end

app/models/repository/darcs.rb

@@ -1,90 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-require 'redmine/scm/adapters/darcs_adapter'
-
-class Repository::Darcs < Repository
-  validates_presence_of :url
-
-  def scm_adapter
-    Redmine::Scm::Adapters::DarcsAdapter
-  end
-  
-  def self.scm_name
-    'Darcs'
-  end
-  
-  def entries(path=nil, identifier=nil)
-    entries=scm.entries(path, identifier)
-    if entries
-      entries.each do |entry|
-        # Search the DB for the entry's last change
-        changeset = changesets.find_by_scmid(entry.lastrev.scmid) if entry.lastrev && !entry.lastrev.scmid.blank?
-        if changeset
-          entry.lastrev.identifier = changeset.revision
-          entry.lastrev.name = changeset.revision
-          entry.lastrev.time = changeset.committed_on
-          entry.lastrev.author = changeset.committer
-        end
-      end
-    end
-    entries
-  end
-  
-  def diff(path, rev, rev_to, type)
-    patch_from = changesets.find_by_revision(rev)
-    patch_to = changesets.find_by_revision(rev_to) if rev_to
-    if path.blank?
-      path = patch_from.changes.collect{|change| change.path}.join(' ')
-    end
-    scm.diff(path, patch_from.scmid, patch_to.scmid, type)
-  end
-  
-  def fetch_changesets
-    scm_info = scm.info
-    if scm_info
-      db_last_id = latest_changeset ? latest_changeset.scmid : nil
-      next_rev = latest_changeset ? latest_changeset.revision + 1 : 1      
-      # latest revision in the repository
-      scm_revision = scm_info.lastrev.scmid      
-      unless changesets.find_by_scmid(scm_revision)
-        revisions = scm.revisions('', db_last_id, nil, :with_path => true)
-        transaction do
-          revisions.reverse_each do |revision|
-            changeset = Changeset.create(:repository => self,
-                                         :revision => next_rev,
-                                         :scmid => revision.scmid,
-                                         :committer => revision.author, 
-                                         :committed_on => revision.time,
-                                         :comments => revision.message)
-            
-            next if changeset.new_record?
-            
-            revision.paths.each do |change|
-              Change.create(:changeset => changeset,
-                            :action => change[:action],
-                            :path => change[:path],
-                            :from_path => change[:from_path],
-                            :from_revision => change[:from_revision])
-            end
-            next_rev += 1
-          end if revisions
-        end
-      end
-    end
-  end
-end

app/models/repository/mercurial.rb

@@ -1,81 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-require 'redmine/scm/adapters/mercurial_adapter'
-
-class Repository::Mercurial < Repository
-  attr_protected :root_url
-  validates_presence_of :url
-
-  def scm_adapter
-    Redmine::Scm::Adapters::MercurialAdapter
-  end
-  
-  def self.scm_name
-    'Mercurial'
-  end
-  
-  def entries(path=nil, identifier=nil)
-    entries=scm.entries(path, identifier)
-    if entries
-      entries.each do |entry|
-        next unless entry.is_file?
-        # Search the DB for the entry's last change
-        change = changes.find(:first, :conditions => ["path = ?", scm.with_leading_slash(entry.path)], :order => "#{Changeset.table_name}.committed_on DESC")
-        if change
-          entry.lastrev.identifier = change.changeset.revision
-          entry.lastrev.name = change.changeset.revision
-          entry.lastrev.author = change.changeset.committer
-          entry.lastrev.revision = change.revision
-        end
-      end
-    end
-    entries
-  end
-
-  def fetch_changesets
-    scm_info = scm.info
-    if scm_info
-      # latest revision found in database
-      db_revision = latest_changeset ? latest_changeset.revision : nil
-      # latest revision in the repository
-      scm_revision = scm_info.lastrev.identifier.to_i
-      
-      unless changesets.find_by_revision(scm_revision)
-        revisions = scm.revisions('', db_revision, nil)
-        transaction do
-          revisions.reverse_each do |revision|
-            changeset = Changeset.create(:repository => self,
-                                         :revision => revision.identifier,
-                                         :scmid => revision.scmid,
-                                         :committer => revision.author, 
-                                         :committed_on => revision.time,
-                                         :comments => revision.message)
-            
-            revision.paths.each do |change|
-              Change.create(:changeset => changeset,
-                            :action => change[:action],
-                            :path => change[:path],
-                            :from_path => change[:from_path],
-                            :from_revision => change[:from_revision])
-            end
-          end
-        end
-      end
-    end
-  end
-end

app/models/repository/subversion.rb

@@ -1,69 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-require 'redmine/scm/adapters/subversion_adapter'
-
-class Repository::Subversion < Repository
-  attr_protected :root_url
-  validates_presence_of :url
-  validates_format_of :url, :with => /^(http|https|svn|file):\/\/.+/i
-
-  def scm_adapter
-    Redmine::Scm::Adapters::SubversionAdapter
-  end
-  
-  def self.scm_name
-    'Subversion'
-  end
-
-  def fetch_changesets
-    scm_info = scm.info
-    if scm_info
-      # latest revision found in database
-      db_revision = latest_changeset ? latest_changeset.revision : 0
-      # latest revision in the repository
-      scm_revision = scm_info.lastrev.identifier.to_i
-      if db_revision < scm_revision
-        logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
-        identifier_from = db_revision + 1
-        while (identifier_from <= scm_revision)
-          # loads changesets by batches of 200
-          identifier_to = [identifier_from + 199, scm_revision].min
-          revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
-          transaction do
-            revisions.reverse_each do |revision|
-              changeset = Changeset.create(:repository => self,
-                                           :revision => revision.identifier, 
-                                           :committer => revision.author, 
-                                           :committed_on => revision.time,
-                                           :comments => revision.message)
-              
-              revision.paths.each do |change|
-                Change.create(:changeset => changeset,
-                              :action => change[:action],
-                              :path => change[:path],
-                              :from_path => change[:from_path],
-                              :from_revision => change[:from_revision])
-              end
-            end
-          end unless revisions.nil?
-          identifier_from = identifier_to + 1
-        end
-      end
-    end
-  end
-end

app/models/role.rb

@@ -1,37 +1,33 @@
-# redMine - project management software
+# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006  Jean-Philippe Lang
-#
+#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
+# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
-# 
+# 
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-# 
+# 
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+
-class Role < ActiveRecord::Base
+class Role < ActiveRecord::Base
-  before_destroy :check_integrity  
+  before_destroy :check_integrity  
-  has_and_belongs_to_many :permissions
+  has_and_belongs_to_many :permissions
-  has_many :workflows, :dependent => :delete_all
+  has_many :workflows, :dependent => :delete_all
-  has_many :members
+  has_many :members
-  acts_as_list
+  acts_as_list
-
+
-  validates_presence_of :name
+  validates_presence_of :name
-  validates_uniqueness_of :name
+  validates_uniqueness_of :name
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-
+
-  def <=>(role)
+private
-    position <=> role.position
+  def check_integrity
-  end
+    raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])
-  
-private
-  def check_integrity
-    raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])
   end
 end

app/models/setting.rb

@@ -49,7 +49,7 @@ class Setting < ActiveRecord::Base
     end
 
     def self.#{name}?
-      self[:#{name}].to_i > 0
+      self[:#{name}].to_s == "1"
     end
 
     def self.#{name}=(value)

app/models/svn_repos.rb

@@ -0,0 +1,214 @@
+# 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 'rexml/document'
+
+module SvnRepos
+
+  class CommandFailed < StandardError #:nodoc:
+  end
+
+  class Base
+    @url = nil
+    @login = nil
+    @password = nil
+        
+    def initialize(url, login=nil, password=nil)
+      @url = url
+      @login = login if login && !login.empty?
+      @password = (password || "") if @login    
+    end
+    
+    # Returns the entry identified by path and revision identifier
+    # or nil if entry doesn't exist in the repository
+    def entry(path=nil, identifier=nil)
+      e = entries(path, identifier)
+      e ? e.first : nil
+    end
+    
+    # Returns an Entries collection
+    # or nil if the given path doesn't exist in the repository
+    def entries(path=nil, identifier=nil)
+      path ||= ''
+      identifier = 'HEAD' unless identifier and identifier > 0
+      entries = Entries.new
+      cmd = "svn list --xml #{target(path)}@#{identifier}"
+      shellout(cmd) do |io|
+        begin
+          doc = REXML::Document.new(io)
+          doc.elements.each("lists/list/entry") do |entry|
+            entries << Entry.new({:name => entry.elements['name'].text,
+                        :path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
+                        :kind => entry.attributes['kind'],
+                        :size => (entry.elements['size'] and entry.elements['size'].text).to_i,
+                        :lastrev => Revision.new({
+                          :identifier => entry.elements['commit'].attributes['revision'],
+                          :time => Time.parse(entry.elements['commit'].elements['date'].text),
+                          :author => (entry.elements['commit'].elements['author'] ? entry.elements['commit'].elements['author'].text : "anonymous")
+                          })
+                        })
+          end
+        rescue
+        end
+      end
+      return nil if $? && $?.exitstatus != 0
+      entries.sort_by_name
+    rescue Errno::ENOENT => e
+      raise CommandFailed
+    end
+
+    def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
+      path ||= ''
+      identifier_from = 'HEAD' unless identifier_from and identifier_from.to_i > 0
+      identifier_to = 1 unless identifier_to and identifier_to.to_i > 0
+      revisions = Revisions.new
+      cmd = "svn log --xml -r #{identifier_from}:#{identifier_to} "
+      cmd << "--verbose " if  options[:with_paths]
+      cmd << target(path)
+      shellout(cmd) do |io|
+        begin
+          doc = REXML::Document.new(io)
+          doc.elements.each("log/logentry") do |logentry|
+            paths = []
+            logentry.elements.each("paths/path") do |path|
+              paths << {:action => path.attributes['action'],
+                        :path => path.text
+                        }
+            end
+            paths.sort! { |x,y| x[:path] <=> y[:path] }
+            
+            revisions << Revision.new({:identifier => logentry.attributes['revision'],
+                          :author => (logentry.elements['author'] ? logentry.elements['author'].text : "anonymous"),
+                          :time => Time.parse(logentry.elements['date'].text),
+                          :message => logentry.elements['msg'].text,
+                          :paths => paths
+                        })
+          end
+        rescue
+        end
+      end
+      return nil if $? && $?.exitstatus != 0
+      revisions
+    rescue Errno::ENOENT => e
+      raise CommandFailed    
+    end
+    
+    def diff(path, identifier_from, identifier_to=nil)
+      path ||= ''
+      if identifier_to and identifier_to.to_i > 0
+        identifier_to = identifier_to.to_i 
+      else
+        identifier_to = identifier_from.to_i - 1
+      end
+      cmd = "svn diff -r "
+      cmd << "#{identifier_to}:"
+      cmd << "#{identifier_from}"
+      cmd << "#{target(path)}@#{identifier_from}"
+      diff = []
+      shellout(cmd) do |io|
+        io.each_line do |line|
+          diff << line
+        end
+      end
+      return nil if $? && $?.exitstatus != 0
+      diff
+    rescue Errno::ENOENT => e
+      raise CommandFailed    
+    end
+    
+    def cat(path, identifier=nil)
+      identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+      cmd = "svn cat #{target(path)}@#{identifier}"
+      cat = nil
+      shellout(cmd) do |io|
+        cat = io.read
+      end
+      return nil if $? && $?.exitstatus != 0
+      cat
+    rescue Errno::ENOENT => e
+      raise CommandFailed    
+    end
+  
+  private
+    def target(path)
+      " \"" << "#{@url}/#{path}".gsub(/["'?<>\*]/, '') << "\""
+    end
+    
+    def logger
+      RAILS_DEFAULT_LOGGER
+    end
+    
+    def shellout(cmd, &block)
+      logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
+      IO.popen(cmd) do |io|
+        block.call(io) if block_given?
+      end
+    end
+  end
+  
+  class Entries < Array
+    def sort_by_name
+      sort {|x,y| 
+        if x.kind == y.kind
+          x.name <=> y.name
+        else
+          x.kind <=> y.kind
+        end
+      }   
+    end
+    
+    def revisions
+      revisions ||= Revisions.new(collect{|entry| entry.lastrev})
+    end
+  end
+  
+  class Entry
+    attr_accessor :name, :path, :kind, :size, :lastrev
+    def initialize(attributes={})
+      self.name = attributes[:name] if attributes[:name]
+      self.path = attributes[:path] if attributes[:path]
+      self.kind = attributes[:kind] if attributes[:kind]
+      self.size = attributes[:size].to_i if attributes[:size]
+      self.lastrev = attributes[:lastrev]
+    end
+    
+    def is_file?
+      'file' == self.kind
+    end
+    
+    def is_dir?
+      'dir' == self.kind
+    end
+  end
+  
+  class Revisions < Array
+    def latest
+      sort {|x,y| x.time <=> y.time}.last    
+    end 
+  end
+  
+  class Revision
+    attr_accessor :identifier, :author, :time, :message, :paths
+    def initialize(attributes={})
+      self.identifier = attributes[:identifier]
+      self.author = attributes[:author]
+      self.time = attributes[:time]
+      self.message = attributes[:message] || ""
+      self.paths = attributes[:paths]
+    end
+  end
+end

app/models/time_entry.rb

@@ -1,50 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class TimeEntry < ActiveRecord::Base
-  # could have used polymorphic association
-  # project association here allows easy loading of time entries at project level with one database trip
-  belongs_to :project
-  belongs_to :issue
-  belongs_to :user
-  belongs_to :activity, :class_name => 'Enumeration', :foreign_key => :activity_id
-  
-  attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
-  
-  validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
-  validates_numericality_of :hours, :allow_nil => true
-  validates_length_of :comments, :maximum => 255
-
-  def before_validation
-    self.project = issue.project if issue && project.nil?
-  end
-  
-  def validate
-    errors.add :hours, :activerecord_error_invalid if hours && (hours < 0 || hours >= 1000)
-    errors.add :project_id, :activerecord_error_invalid if project.nil?
-    errors.add :issue_id, :activerecord_error_invalid if (issue_id && !issue) || (issue && project!=issue.project)
-  end
-  
-  # tyear, tmonth, tweek assigned where setting spent_on attributes
-  # these attributes make time aggregations easier
-  def spent_on=(date)
-    super
-    self.tyear = spent_on ? spent_on.year : nil
-    self.tmonth = spent_on ? spent_on.month : nil
-    self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
-  end  
-end