tagged version 0.4.2

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

app/controllers/account_controller.rb

@@ -21,17 +21,13 @@ class AccountController < ApplicationController
   include CustomFieldsHelper   
   
   # prevents login action to be filtered by check_if_login_required application scope filter
-  skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register, :activate]
+  skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]
+  before_filter :require_login, :only => :logout
 
   # Show user's account
   def show
-    @user = User.find_active(params[:id])
+    @user = User.find(params[:id])
     @custom_values = @user.custom_values.find(:all, :include => :custom_field)
-    
-    # show only public projects and private projects that the logged in user is also a member of
-    @memberships = @user.memberships.select do |membership|
-      membership.project.is_public? || (User.current.role_for_project(membership.project))
-    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end
@@ -40,38 +36,31 @@ class AccountController < ApplicationController
   def login
     if request.get?
       # Logout user
-      self.logged_user = nil
+      self.logged_in_user = nil
     else
       # Authenticate user
       user = User.try_to_login(params[:login], params[:password])
       if user
-        self.logged_user = user
+        self.logged_in_user = user
-        # generate a key and set cookie if autologin
-        if params[:autologin] && Setting.autologin?
-          token = Token.create(:user => user, :action => 'autologin')
-          cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
-        end
         redirect_back_or_default :controller => 'my', :action => 'page'
       else
-        flash.now[:error] = l(:notice_account_invalid_creditentials)
+        flash.now[:notice] = l(:notice_account_invalid_creditentials)
       end
     end
   end
 
   # Log out current user and redirect to welcome page
   def logout
-    cookies.delete :autologin
+    self.logged_in_user = nil
-    Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged?
+    redirect_to :controller => 'welcome'
-    self.logged_user = nil
-    redirect_to home_url
   end
   
   # Enable user to choose a new password
   def lost_password
-    redirect_to(home_url) && return unless Setting.lost_password?
+    redirect_to :controller => 'welcome' and return unless Setting.lost_password?
     if params[:token]
       @token = Token.find_by_action_and_value("recovery", params[:token])
-      redirect_to(home_url) && return unless @token and !@token.expired?
+      redirect_to :controller => 'welcome' and return unless @token and !@token.expired?
       @user = @token.user
       if request.post?
         @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
@@ -88,9 +77,9 @@ class AccountController < ApplicationController
       if request.post?
         user = User.find_by_mail(params[:mail])
         # user not found in db
-        flash.now[:error] = l(:notice_account_unknown_email) and return unless user
+        flash.now[:notice] = l(:notice_account_unknown_email) and return unless user
         # user uses an external authentification
-        flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id
+        flash.now[:notice] = l(:notice_can_t_change_password) and return if user.auth_source_id
         # create a new token for password recovery
         token = Token.new(:user => user, :action => "recovery")
         if token.save
@@ -105,71 +94,38 @@ class AccountController < ApplicationController
   
   # User self-registration
   def register
-    redirect_to(home_url) && return unless Setting.self_registration?
+    redirect_to :controller => 'welcome' and return unless Setting.self_registration?
-    if request.get?
+    if params[:token]
-      @user = User.new(:language => Setting.default_language)
+      token = Token.find_by_action_and_value("register", params[:token])
-      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
+      redirect_to :controller => 'welcome' and return unless token and !token.expired?
+      user = token.user
+      redirect_to :controller => 'welcome' and return unless user.status == User::STATUS_REGISTERED
+      user.status = User::STATUS_ACTIVE
+      if user.save
+        token.destroy
+        flash[:notice] = l(:notice_account_activated)
+        redirect_to :action => 'login'
+        return
+      end      
     else
-      @user = User.new(params[:user])
+      if request.get?
-      @user.admin = false
+        @user = User.new(:language => Setting.default_language)
-      @user.login = params[:user][:login]
+        @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
-      @user.status = User::STATUS_REGISTERED
+      else
-      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
+        @user = User.new(params[:user])
-      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, 
+        @user.admin = false
-                                                                                :customized => @user, 
+        @user.login = params[:user][:login]
-                                                                                :value => (params["custom_fields"] ? params["custom_fields"][x.id.to_s] : nil)) }
+        @user.status = User::STATUS_REGISTERED
-      @user.custom_values = @custom_values
+        @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
-      case Setting.self_registration
+        @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
-      when '1'
+        @user.custom_values = @custom_values
-        # Email activation
         token = Token.new(:user => @user, :action => "register")
         if @user.save and token.save
           Mailer.deliver_register(token)
           flash[:notice] = l(:notice_account_register_done)
-          redirect_to :action => 'login'
+          redirect_to :controller => 'welcome' and return
-        end
-      when '3'
-        # Automatic activation
-        @user.status = User::STATUS_ACTIVE
-        if @user.save
-          flash[:notice] = l(:notice_account_activated)
-          redirect_to :action => 'login'
-        end
-      else
-        # Manual activation by the administrator
-        if @user.save
-          # Sends an email to the administrators
-          Mailer.deliver_account_activation_request(@user)
-          flash[:notice] = l(:notice_account_pending)
-          redirect_to :action => 'login'
         end
       end
     end
   end
-  
-  # Token based account activation
-  def activate
-    redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
-    token = Token.find_by_action_and_value('register', params[:token])
-    redirect_to(home_url) && return unless token and !token.expired?
-    user = token.user
-    redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
-    user.status = User::STATUS_ACTIVE
-    if user.save
-      token.destroy
-      flash[:notice] = l(:notice_account_activated)
-    end
-    redirect_to :action => 'login'
-  end
-  
-private
-  def logged_user=(user)
-    if user && user.is_a?(User)
-      User.current = user
-      session[:user_id] = user.id
-    else
-      User.current = User.anonymous
-      session[:user_id] = nil
-    end
-  end
 end

app/controllers/admin_controller.rb

@@ -28,17 +28,11 @@ class AdminController < ApplicationController
   def projects
     sort_init 'name', 'asc'
     sort_update		
-    
+    @project_count = Project.count		
-    @status = params[:status] ? params[:status].to_i : 0
-    conditions = nil
-    conditions = ["status=?", @status] unless @status == 0
-    
-    @project_count = Project.count(:conditions => conditions)
     @project_pages = Paginator.new self, @project_count,
-								25,
+								15,
 								params['page']								
     @projects = Project.find :all, :order => sort_clause,
-                        :conditions => conditions,
 						:limit  =>  @project_pages.items_per_page,
 						:offset =>  @project_pages.current.offset
 
@@ -46,37 +40,16 @@ class AdminController < ApplicationController
   end
 
   def mail_options
-    @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted)
+    @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || []
     if request.post?
-      settings = (params[:settings] || {}).dup
+      @actions.each { |a|
-      settings[:notified_events] ||= []
+        a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s 
-      settings.each { |name, value| Setting[name] = value }
+        a.save
-      flash[:notice] = l(:notice_successful_update)
+      }
-      redirect_to :controller => 'admin', :action => 'mail_options'
+      flash.now[:notice] = l(:notice_successful_update)
     end
   end
   
-  def test_email
-    raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
-    # Force ActionMailer to raise delivery errors so we can catch it
-    ActionMailer::Base.raise_delivery_errors = true
-    begin
-      @test = Mailer.deliver_test(User.current)
-      flash[:notice] = l(:notice_email_sent, User.current.mail)
-    rescue Exception => e
-      flash[:error] = l(:notice_email_error, e.message)
-    end
-    ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
-    redirect_to :action => 'mail_options'
-  end
-  
   def info
-    @db_adapter_name = ActiveRecord::Base.connection.adapter_name
-    @flags = {
-      :default_admin_changed => User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?,
-      :file_repository_writable => File.writable?(Attachment.storage_path),
-      :rmagick_available => Object.const_defined?(:Magick)
-    }
-    @plugins = Redmine::Plugin.registered_plugins
   end  
 end

app/controllers/application.rb

@@ -16,44 +16,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class ApplicationController < ActionController::Base
-  before_filter :user_setup, :check_if_login_required, :set_localization
+  before_filter :check_if_login_required, :set_localization
-  filter_parameter_logging :password
   
-  REDMINE_SUPPORTED_SCM.each do |scm|
+  def logged_in_user=(user)
-    require_dependency "repository/#{scm.underscore}"
+    @logged_in_user = user
+    session[:user_id] = (user ? user.id : nil)
   end
   
-  def current_role
+  def logged_in_user
-    @current_role ||= User.current.role_for_project(@project)
-  end
-  
-  def user_setup
-    Setting.check_cache
     if session[:user_id]
-      # existing session
+      @logged_in_user ||= User.find(session[:user_id])
-      User.current = User.find(session[:user_id])
-    elsif cookies[:autologin] && Setting.autologin?
-      # auto-login feature
-      User.current = User.find_by_autologin_key(cookies[:autologin])
-    elsif params[:key] && accept_key_auth_actions.include?(params[:action])
-      # RSS key authentication
-      User.current = User.find_by_rss_key(params[:key])
     else
-      User.current = User.anonymous
+      nil
     end
   end
   
   # check if login is globally required to access the application
   def check_if_login_required
-    # no check needed if user is already logged in
-    return true if User.current.logged?
     require_login if Setting.login_required?
   end 
   
   def set_localization
     lang = begin
-      if !User.current.language.blank? and GLoc.valid_languages.include? User.current.language.to_sym
+      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.current.language
+        self.logged_in_user.language
       elsif request.env['HTTP_ACCEPT_LANGUAGE']
         accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
         if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
@@ -67,7 +53,7 @@ class ApplicationController < ActionController::Base
   end
   
   def require_login
-    if !User.current.logged?
+    unless self.logged_in_user
       store_location
       redirect_to :controller => "account", :action => "login"
       return false
@@ -77,29 +63,30 @@ class ApplicationController < ActionController::Base
 
   def require_admin
     return unless require_login
-    if !User.current.admin?
+    unless self.logged_in_user.admin?
-      render_403
+      render :nothing => true, :status => 403
       return false
     end
     true
   end
 
-  # Authorize the user for the requested action
+  # authorizes the user for the requested action.
   def authorize(ctrl = params[:controller], action = params[:action])
-    allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project)
+    # check if action is allowed on public projects
-    allowed ? true : (User.current.logged? ? render_403 : require_login)
+    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ ctrl, action ]
-  end
+      return true
-  
-  # 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? || User.current.member_of?(@project) || User.current.admin?
+    # if action is not public, force login
-    User.current.logged? ? render_403 : require_login
+    return unless require_login    
+    # admin is always authorized
+    return true if self.logged_in_user.admin?
+    # if not admin, check membership permission    
+    @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id])    
+    if @user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], @user_membership.role_id )    
+      return true		
+    end		
+    render :nothing => true, :status => 403
+    false
   end
 
   # store current uri in session.
@@ -118,33 +105,12 @@ class ApplicationController < ActionController::Base
     end
   end
   
-  def render_403
-    @project = nil
-    render :template => "common/403", :layout => !request.xhr?, :status => 403
-    return false
-  end
-    
   def render_404
-    render :template => "common/404", :layout => !request.xhr?, :status => 404
+    @html_title = "404"
+    render :template => "common/404", :layout => true, :status => 404
     return false
   end
 
-  def render_feed(items, options={})    
-    @items = items || []
-    @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
-    @title = options[:title] || Setting.app_title
-    render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'
-  end
-  
-  def self.accept_key_auth(*actions)
-    actions = actions.flatten.map(&:to_s)
-    write_inheritable_attribute('accept_key_auth_actions', actions)
-  end
-  
-  def accept_key_auth_actions
-    self.class.read_inheritable_attribute('accept_key_auth_actions') || []
-  end
-
   # qvalues http header parser
   # code taken from webrick
   def parse_qvalues(value)

app/controllers/attachments_controller.rb

@@ -1,39 +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
-
-  def download
-    # images are sent inline
-    send_file @attachment.diskfile, :filename => @attachment.filename, 
-                                    :type => @attachment.content_type, 
-                                    :disposition => (@attachment.image? ? 'inline' : 'attachment')
-  rescue
-    # in case the disk file was deleted
-    render_404
-  end
- 
-private
-  def find_project
-    @attachment = Attachment.find(params[:id])
-    @project = @attachment.project
-  rescue
-    render_404
-  end
-end

app/controllers/auth_sources_controller.rb

@@ -65,10 +65,10 @@ class AuthSourcesController < ApplicationController
     @auth_method = AuthSource.find(params[:id])
     begin
       @auth_method.test_connection
-      flash[:notice] = l(:notice_successful_connection)
     rescue => text
-      flash[:error] = "Unable to connect (#{text})"
+      flash[:notice] = text
     end
+    flash[:notice] ||= l(:notice_successful_connection)
     redirect_to :action => 'list'
   end
 

app/controllers/boards_controller.rb

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

app/controllers/custom_fields_controller.rb

@@ -25,7 +25,7 @@ class CustomFieldsController < ApplicationController
   end
 
   def list
-    @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.class.name }
+    @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.type.to_s }
     @tab = params[:tab] || 'IssueCustomField'
     render :action => "list", :layout => false if request.xhr?
   end
@@ -45,7 +45,7 @@ class CustomFieldsController < ApplicationController
     end  
     if request.post? and @custom_field.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'list', :tab => @custom_field.class.name
+      redirect_to :action => 'list', :tab => @custom_field.type
     end
     @trackers = Tracker.find(:all, :order => 'position')
   end
@@ -57,31 +57,16 @@ class CustomFieldsController < ApplicationController
         @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
       end
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'list', :tab => @custom_field.class.name
+      redirect_to :action => 'list', :tab => @custom_field.type
     end
     @trackers = Tracker.find(:all, :order => 'position')
   end
 
-  def move
-    @custom_field = CustomField.find(params[:id])
-    case params[:position]
-    when 'highest'
-      @custom_field.move_to_top
-    when 'higher'
-      @custom_field.move_higher
-    when 'lower'
-      @custom_field.move_lower
-    when 'lowest'
-      @custom_field.move_to_bottom
-    end if params[:position]
-    redirect_to :action => 'list', :tab => @custom_field.class.name
-  end
-  
   def destroy
     @custom_field = CustomField.find(params[:id]).destroy
-    redirect_to :action => 'list', :tab => @custom_field.class.name
+    redirect_to :action => 'list', :tab => @custom_field.type
   rescue
-    flash[:error] = "Unable to delete custom field"
+    flash[:notice] = "Unable to delete custom field"
     redirect_to :action => 'list'
   end
 end

app/controllers/documents_controller.rb

@@ -39,7 +39,7 @@ class DocumentsController < ApplicationController
   def download
     @attachment = @document.attachments.find(params[:attachment_id])
     @attachment.increment_download
-    send_file @attachment.diskfile, :filename => @attachment.filename, :type => @attachment.content_type
+    send_file @attachment.diskfile, :filename => @attachment.filename
   rescue
     render_404
   end 
@@ -49,10 +49,10 @@ class DocumentsController < ApplicationController
     @attachments = []
     params[:attachments].each { |file|
       next unless file.size > 0
-      a = Attachment.create(:container => @document, :file => file, :author => User.current)
+      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_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('document_added')
+    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
   

app/controllers/enumerations_controller.rb

@@ -59,27 +59,12 @@ class EnumerationsController < ApplicationController
     end
   end
 
-  def move
-    @enumeration = Enumeration.find(params[:id])
-    case params[:position]
-    when 'highest'
-      @enumeration.move_to_top
-    when 'higher'
-      @enumeration.move_higher
-    when 'lower'
-      @enumeration.move_lower
-    when 'lowest'
-      @enumeration.move_to_bottom
-    end if params[:position]
-    redirect_to :action => 'index'
-  end
-  
   def destroy
     Enumeration.find(params[:id]).destroy
     flash[:notice] = l(:notice_successful_delete)
     redirect_to :action => 'list'
   rescue
-    flash[:error] = "Unable to delete enumeration"
+    flash[:notice] = "Unable to delete enumeration"
     redirect_to :action => 'list'
   end
 end

app/controllers/feeds_controller.rb

@@ -15,16 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-module TimelogHelper
+class FeedsController < ApplicationController
-  def select_hours(data, criteria, value)
+  session :off
-    data.select {|row| row[criteria] == value.to_s}
-  end
   
-  def sum_hours(data)
+  def news
-    sum = 0
+    @news = News.find :all, :order => 'news.created_on DESC', :limit => 10, :include => [ :author, :project ]
-    data.each do |row|
+    headers["Content-Type"] = "application/rss+xml"
-      sum += row['hours'].to_f
-    end
-    sum
   end
 end

app/controllers/help_controller.rb

@@ -0,0 +1,47 @@
+# 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 HelpController < ApplicationController
+
+  skip_before_filter :check_if_login_required
+  before_filter :load_help_config
+
+  # displays help page for the requested controller/action
+  def index	
+    # select help page to display
+    if params[:ctrl] and @help_config['pages'][params[:ctrl]]
+      if params[:page] and @help_config['pages'][params[:ctrl]][params[:page]]
+        template = @help_config['pages'][params[:ctrl]][params[:page]]
+      else
+        template = @help_config['pages'][params[:ctrl]]['index']
+      end
+    end
+    # choose language according to available help translations
+    lang = (@help_config['langs'].include? current_language.to_s) ? current_language.to_s : @help_config['langs'].first
+	
+    if template
+      redirect_to "/manual/#{lang}/#{template}"
+    else
+      redirect_to "/manual/#{lang}/index.html"
+    end
+  end
+
+private
+  def load_help_config
+    @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml"))
+  end	
+end

app/controllers/issue_categories_controller.rb

@@ -19,8 +19,6 @@ class IssueCategoriesController < ApplicationController
   layout 'base'
   before_filter :find_project, :authorize
 
-  verify :method => :post, :only => :destroy
-
   def edit
     if request.post? and @category.update_attributes(params[:category])
       flash[:notice] = l(:notice_successful_update)
@@ -29,17 +27,11 @@ class IssueCategoriesController < ApplicationController
   end
 
   def destroy
-    @issue_count = @category.issues.size
+    @category.destroy
-    if @issue_count == 0
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-      # No issue assigned to this category
+  rescue
-      @category.destroy
+    flash[:notice] = "Categorie can't be deleted"
-      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-    elsif params[:todo]
-      reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign'
-      @category.destroy(reassign_to)
-      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
-    end
-    @categories = @project.issue_categories - [@category]
   end
 
 private

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

@@ -79,7 +79,7 @@ class IssueStatusesController < ApplicationController
     IssueStatus.find(params[:id]).destroy
     redirect_to :action => 'list'
   rescue
-    flash[:error] = "Unable to delete issue status"
+    flash[:notice] = "Unable to delete issue status"
     redirect_to :action => 'list'
   end  	
 end

app/controllers/issues_controller.rb

@@ -16,77 +16,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssuesController < ApplicationController
-  layout 'base'
+  layout 'base', :except => :export_pdf
-  before_filter :find_project, :authorize, :except => [:index, :changes, :preview]
+  before_filter :find_project, :authorize
-  before_filter :find_optional_project, :only => [:index, :changes]
-  accept_key_auth :index, :changes
 
-  cache_sweeper :issue_sweeper, :only => [ :edit, :change_status, :destroy ]
-
-  helper :projects
-  include ProjectsHelper   
   helper :custom_fields
   include CustomFieldsHelper
   helper :ifpdf
   include IfpdfHelper
-  helper :issue_relations
-  include IssueRelationsHelper
-  helper :watchers
-  include WatchersHelper
-  helper :attachments
-  include AttachmentsHelper
-  helper :queries
-  helper :sort
-  include SortHelper
-  include IssuesHelper
-
-  def index
-    sort_init "#{Issue.table_name}.id", "desc"
-    sort_update
-    retrieve_query
-    if @query.valid?
-      limit = %w(pdf csv).include?(params[:format]) ? Setting.issues_export_limit.to_i : 25
-      @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
-      @issue_pages = Paginator.new self, @issue_count, limit, params['page']
-      @issues = Issue.find :all, :order => sort_clause,
-                           :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
-                           :conditions => @query.statement,
-                           :limit  =>  limit,
-                           :offset =>  @issue_pages.current.offset
-      respond_to do |format|
-        format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
-        format.atom { render_feed(@issues, :title => l(:label_issue_plural)) }
-        format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
-        format.pdf  { send_data(render(:template => 'issues/index.rfpdf', :layout => false), :type => 'application/pdf', :filename => 'export.pdf') }
-      end
-    else
-      # Send html if the query is not valid
-      render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
-    end
-  end
-  
-  def changes
-    sort_init "#{Issue.table_name}.id", "desc"
-    sort_update
-    retrieve_query
-    if @query.valid?
-      @changes = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
-                                     :conditions => @query.statement,
-                                     :limit => 25,
-                                     :order => "#{Journal.table_name}.created_on DESC"
-    end
-    @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
-    render :layout => false, :content_type => 'application/atom+xml'
-  end
 
   def show
-    @custom_values = @issue.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
+    @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
-    @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
+    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
-    @status_options = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)
+    @journals_count = @issue.journals.count
-    respond_to do |format|
+    @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "journals.created_on desc")
-      format.html { render :template => 'issues/show.rhtml' }
+  end
-      format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
+  
-    end
+  def history
+    @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "journals.created_on desc")
+    @journals_count = @journals.length  
+  end
+  
+  def export_pdf
+    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
+    @options_for_rfpdf ||= {}
+    @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.long_id}.pdf"
   end
 
   def edit
@@ -95,156 +48,102 @@ class IssuesController < ApplicationController
       @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
       begin
-        @issue.init_journal(User.current)
+        @issue.init_journal(self.logged_in_user)
         # Retrieve custom fields and values
-        if params["custom_fields"]
+        @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
-        end
         @issue.attributes = params[:issue]
         if @issue.save
           flash[:notice] = l(:notice_successful_update)
-          redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
+          redirect_to :action => 'show', :id => @issue
         end
       rescue ActiveRecord::StaleObjectError
         # Optimistic locking exception
-        flash[:error] = l(:notice_locking_conflict)
+        flash[:notice] = l(:notice_locking_conflict)
       end
     end		
   end
   
   def add_note
-    journal = @issue.init_journal(User.current, params[:notes])
+    unless params[:notes].empty?
-    params[:attachments].each { |file|
+      journal = @issue.init_journal(self.logged_in_user, params[:notes])
-      next unless file.size > 0
+      #@history = @issue.histories.build(params[:history])
-      a = Attachment.create(:container => @issue, :file => file, :author => User.current)
+      #@history.author_id = self.logged_in_user.id if self.logged_in_user
-      journal.details << JournalDetail.new(:property => 'attachment',
+      #@history.status = @issue.status
-                                           :prop_key => a.id,
+      if @issue.save
-                                           :value => a.filename) unless a.new_record?
+        flash[:notice] = l(:notice_successful_update)
-    } if params[:attachments] and params[:attachments].is_a? Array
+        Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-    if journal.save
+        redirect_to :action => 'show', :id => @issue
-      flash[:notice] = l(:notice_successful_update)
+        return
-      Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
+      end
-      redirect_to :action => 'show', :id => @issue
-      return
     end
     show
+    render :action => 'show'
   end
 
   def change_status
-    @status_options = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)
+    #@history = @issue.histories.build(params[:history])	
+    @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
     @new_status = IssueStatus.find(params[:new_status_id])
     if params[:confirm]
       begin
-        journal = @issue.init_journal(User.current, params[:notes])
+        #@history.author_id = self.logged_in_user.id if self.logged_in_user
+        #@issue.status = @history.status
+        #@issue.fixed_version_id = (params[:issue][:fixed_version_id])
+        #@issue.assigned_to_id = (params[:issue][:assigned_to_id])
+        #@issue.done_ratio = (params[:issue][:done_ratio])
+        #@issue.lock_version = (params[:issue][:lock_version])
+        journal = @issue.init_journal(self.logged_in_user, params[:notes])
         @issue.status = @new_status
         if @issue.update_attributes(params[:issue])
-          # Save attachments
-          params[:attachments].each { |file|
-            next unless file.size > 0
-            a = Attachment.create(:container => @issue, :file => file, :author => User.current)            
-            journal.details << JournalDetail.new(:property => 'attachment',
-                                                 :prop_key => a.id,
-                                                 :value => a.filename) unless a.new_record?
-          } if params[:attachments] and params[:attachments].is_a? Array
-        
-          # Log time
-          if current_role.allowed_to?(:log_time)
-            @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
-            @time_entry.attributes = params[:time_entry]
-            @time_entry.save
-          end
-          
           flash[:notice] = l(:notice_successful_update)
-          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
+          Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
           redirect_to :action => 'show', :id => @issue
         end
       rescue ActiveRecord::StaleObjectError
         # Optimistic locking exception
-        flash[:error] = l(:notice_locking_conflict)
+        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 :action => 'index', :project_id => @project
+    redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
   end
 
-  def destroy_attachment
+  def add_attachment
-    a = @issue.attachments.find(params[:attachment_id])
+    # Save the attachments
-    a.destroy
+    @attachments = []
-    journal = @issue.init_journal(User.current)
+    params[:attachments].each { |file|
-    journal.details << JournalDetail.new(:property => 'attachment',
+      next unless file.size > 0
-                                         :prop_key => a.id,
+      a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
-                                         :old_value => a.filename)
+      @attachments << a unless a.new_record?
-    journal.save
+    } 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 => @issue
   end
 
-  def context_menu
+  def destroy_attachment
-    @priorities = Enumeration.get_values('IPRI').reverse
+    @issue.attachments.find(params[:attachment_id]).destroy
-    @statuses = IssueStatus.find(:all, :order => 'position')
+    redirect_to :action => 'show', :id => @issue
-    @allowed_statuses = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)
-    @assignables = @issue.assignable_users
-    @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
-    @can = {:edit => User.current.allowed_to?(:edit_issues, @project),
-            :change_status => User.current.allowed_to?(:change_issue_status, @project),
-            :add => User.current.allowed_to?(:add_issues, @project),
-            :move => User.current.allowed_to?(:move_issues, @project),
-            :copy => (@project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
-            :delete => User.current.allowed_to?(:delete_issues, @project)}
-    render :layout => false
   end
 
-  def preview
+  # Send the file in stream mode
-    issue = Issue.find_by_id(params[:id])
+  def download
-    @attachements = issue.attachments if issue
+    @attachment = @issue.attachments.find(params[:attachment_id])
-    @text = params[:issue][:description]
+    send_file @attachment.diskfile, :filename => @attachment.filename
-    render :partial => 'common/preview'
+  rescue
+    render_404
   end
 
 private
   def find_project
     @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
     @project = @issue.project
+    @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
   rescue ActiveRecord::RecordNotFound
     render_404
   end  
-  
-  def find_optional_project
-    return true unless params[:project_id]
-    @project = Project.find(params[:project_id])
-    authorize
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-  
-  # Retrieve query from session or build a new query
-  def retrieve_query
-    if params[:query_id]
-      @query = Query.find(params[:query_id], :conditions => {:project_id => (@project ? @project.id : nil)})
-      session[:query] = @query
-    else
-      if params[:set_filter] or !session[:query] or session[:query].project != @project
-        # Give it a name, required to be valid
-        @query = Query.new(:name => "_")
-        @query.project = @project
-        if params[:fields] and params[:fields].is_a? Array
-          params[:fields].each do |field|
-            @query.add_filter(field, params[:operators][field], params[:values][field])
-          end
-        else
-          @query.available_filters.keys.each do |field|
-            @query.add_short_filter(field, params[field]) if params[field]
-          end
-        end
-        session[:query] = @query
-      else
-        @query = session[:query]
-      end
-    end
-  end
 end

app/controllers/members_controller.rb

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

app/controllers/messages_controller.rb

@@ -1,104 +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_board, :only => :new
-  before_filter :find_message, :except => :new
-  before_filter :authorize
-
-  verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
-
-  helper :attachments
-  include AttachmentsHelper   
-
-  # Show a topic and its replies
-  def show
-    @reply = Message.new(:subject => "RE: #{@message.subject}")
-    render :action => "show", :layout => false if request.xhr?
-  end
-  
-  # Create a new topic
-  def new
-    @message = Message.new(params[:message])
-    @message.author = User.current
-    @message.board = @board
-    if params[:message] && User.current.allowed_to?(:edit_messages, @project)
-      @message.locked = params[:message]['locked']
-      @message.sticky = params[:message]['sticky']
-    end
-    if request.post? && @message.save
-      params[:attachments].each { |file|
-        Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
-      } if params[:attachments] and params[:attachments].is_a? Array    
-      redirect_to :action => 'show', :id => @message
-    end
-  end
-
-  # Reply to a topic
-  def reply
-    @reply = Message.new(params[:reply])
-    @reply.author = User.current
-    @reply.board = @board
-    @topic.children << @reply
-    if !@reply.new_record?
-      params[:attachments].each { |file|
-        Attachment.create(:container => @reply, :file => file, :author => User.current) if file.size > 0
-      } if params[:attachments] and params[:attachments].is_a? Array
-    end
-    redirect_to :action => 'show', :id => @topic
-  end
-
-  # Edit a message
-  def edit
-    if params[:message] && User.current.allowed_to?(:edit_messages, @project)
-      @message.locked = params[:message]['locked']
-      @message.sticky = params[:message]['sticky']
-    end
-    if request.post? && @message.update_attributes(params[:message])
-      params[:attachments].each { |file|
-        Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
-      } if params[:attachments] and params[:attachments].is_a? Array
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'show', :id => @topic
-    end
-  end
-  
-  # Delete a messages
-  def destroy
-    @message.destroy
-    redirect_to @message.parent.nil? ?
-      { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
-      { :action => 'show', :id => @message.parent }
-  end
-  
-private
-  def find_message
-    find_board
-    @message = @board.messages.find(params[:id], :include => :parent)
-    @topic = @message.root
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-  
-  def find_board
-    @board = Board.find(params[:board_id], :include => :project)
-    @project = @board.project
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/my_controller.rb

@@ -16,14 +16,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MyController < ApplicationController
-  helper :issues
-  
   layout 'base'
   before_filter :require_login
 
   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
@@ -44,65 +41,44 @@ class MyController < ApplicationController
 
   # Show user's page
   def page
-    @user = User.current
+    @user = self.logged_in_user
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
   end
 
   # Edit user's account
   def account
-    @user = User.current
+    @user = self.logged_in_user
     @pref = @user.pref
-    if request.post?
+    @user.attributes = params[:user]
-      @user.attributes = params[:user]
+    @user.pref.attributes = params[:pref]
-      @user.mail_notification = (params[:notification_option] == 'all')
+    if request.post? and @user.save and @user.pref.save
-      @user.pref.attributes = params[:pref]
+      set_localization
-      @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
+      flash.now[:notice] = l(:notice_account_updated)
+      self.logged_in_user.reload
+    end
+  end
+
+  # Change user's password
+  def change_password
+    @user = self.logged_in_user
+    flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
+    if @user.check_password?(params[:password])
+      @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
       if @user.save
-        @user.pref.save
+        flash[:notice] = l(:notice_account_password_updated)
-        @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
+      else
-        set_language_if_valid @user.language
+        render :action => 'account'
-        flash[:notice] = l(:notice_account_updated)
-        redirect_to :action => 'account'
         return
       end
-    end
+    else
-    @notification_options = [[l(:label_user_mail_option_all), 'all'],
+      flash[:notice] = l(:notice_account_wrong_password)
-                             [l(:label_user_mail_option_none), 'none']]
-    # Only users that belong to more than 1 project can select projects for which they are notified
-    # Note that @user.membership.size would fail since AR ignores :include association option when doing a count
-    @notification_options.insert 1, [l(:label_user_mail_option_selected), 'selected'] if @user.memberships.length > 1
-    @notification_option = @user.mail_notification? ? 'all' : (@user.notified_projects_ids.empty? ? 'none' : 'selected')    
-  end
-
-  # Manage user's password
-  def password
-    @user = User.current
-    flash[:error] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
-    if request.post?
-      if @user.check_password?(params[:password])
-        @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-        if @user.save
-          flash[:notice] = l(:notice_account_password_updated)
-          redirect_to :action => 'account'
-        end
-      else
-        flash[:error] = l(:notice_account_wrong_password)
-      end
-    end
-  end
-  
-  # Create a new feeds key
-  def reset_rss_key
-    if request.post? && User.current.rss_token
-      User.current.rss_token.destroy
-      flash[:notice] = l(:notice_feeds_access_key_reseted)
     end
     redirect_to :action => 'account'
   end
 
   # User's page layout configuration
   def page_layout
-    @user = User.current
+    @user = self.logged_in_user
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
     session[:page_layout] = @blocks
     %w(top left right).each {|f| session[:page_layout][f] ||= [] }
@@ -114,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
+    @user = self.logged_in_user
     block = params[:block]
-    render(:nothing => true) and return unless block && (BLOCKS.keys.include? block)
-    @user = User.current
     # remove if already present in a group
     %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
     # add it on top
@@ -151,7 +126,7 @@ class MyController < ApplicationController
   
   # Save user's page layout  
   def page_layout_save
-    @user = User.current
+    @user = self.logged_in_user
     @user.pref[:my_page_layout] = session[:page_layout] if session[:page_layout]
     @user.pref.save
     session[:page_layout] = nil

app/controllers/news_controller.rb

@@ -17,21 +17,7 @@
 
 class NewsController < ApplicationController
   layout 'base'
-  before_filter :find_project, :authorize, :except => :index
+  before_filter :find_project, :authorize
-  before_filter :find_optional_project, :only => :index
-  accept_key_auth :index
-  
-  def index
-    @news_pages, @newss = paginate :news,
-                                   :per_page => 10,
-                                   :conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
-                                   :include => [:author, :project],
-                                   :order => "#{News.table_name}.created_on DESC"    
-    respond_to do |format|
-      format.html { render :layout => false if request.xhr? }
-      format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
-    end
-  end
 
   def show
   end
@@ -45,7 +31,7 @@ class NewsController < ApplicationController
   
   def add_comment
     @comment = Comment.new(params[:comment])
-    @comment.author = User.current
+    @comment.author = logged_in_user
     if @news.comments << @comment
       flash[:notice] = l(:label_comment_added)
       redirect_to :action => 'show', :id => @news
@@ -61,7 +47,7 @@ class NewsController < ApplicationController
 
   def destroy
     @news.destroy
-    redirect_to :action => 'index', :project_id => @project
+    redirect_to :controller => 'projects', :action => 'list_news', :id => @project
   end
   
 private
@@ -71,12 +57,4 @@ private
   rescue ActiveRecord::RecordNotFound
     render_404
   end  
-  
-  def find_optional_project
-    return true unless params[:project_id]
-    @project = Project.find(params[:project_id])
-    authorize
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
 end

app/controllers/projects_controller.rb

@@ -15,16 +15,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'csv'
+
 class ProjectsController < ApplicationController
   layout 'base'
-  before_filter :find_project, :except => [ :index, :list, :add ]
+  before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
-  before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
+  before_filter :require_admin, :only => [ :add, :destroy ]
-  before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
-  accept_key_auth :activity, :calendar
-  
-  cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
-  cache_sweeper :issue_sweeper, :only => [ :add_issue ]
-  cache_sweeper :version_sweeper, :only => [ :add_version ]
 
   helper :sort
   include SortHelper
@@ -32,46 +28,47 @@ class ProjectsController < ApplicationController
   include CustomFieldsHelper   
   helper :ifpdf
   include IfpdfHelper
-  helper :issues
   helper IssuesHelper
   helper :queries
   include QueriesHelper
-  helper :repositories
-  include RepositoriesHelper
-  include ProjectsHelper
   
   def index
     list
     render :action => 'list' unless request.xhr?
   end
 
-  # Lists visible projects
+  # Lists public projects
   def list
-    projects = Project.find :all,
+    sort_init 'name', 'asc'
-                            :conditions => Project.visible_by(User.current),
+    sort_update		
-                            :include => :parent
+    @project_count = Project.count(:all, :conditions => ["is_public=?", true])		
-    @project_tree = projects.group_by {|p| p.parent || p}
+    @project_pages = Paginator.new self, @project_count,
-    @project_tree.each_key {|p| @project_tree[p] -= [p]}
+								15,
+								params['page']								
+    @projects = Project.find :all, :order => sort_clause,
+						:conditions => ["is_public=?", true],
+						:limit  =>  @project_pages.items_per_page,
+						:offset =>  @project_pages.current.offset
+
+    render :action => "list", :layout => false if request.xhr?	
   end
           
   # Add a new project
   def add
-    @custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
+    @custom_fields = IssueCustomField.find(:all)
-    @trackers = Tracker.all
+    @root_projects = Project.find(:all, :conditions => "parent_id is null")
-    @root_projects = Project.find(:all,
-                                  :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
-                                  :order => 'name')
     @project = Project.new(params[:project])
-    @project.enabled_module_names = Redmine::AccessControl.available_project_modules
     if request.get?
-      @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
+      @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
-      @project.trackers = Tracker.all
     else
       @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
-      @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
+      @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
       @project.custom_values = @custom_values			
+      if params[:repository_enabled] && params[:repository_enabled] == "1"
+        @project.repository = Repository.new
+        @project.repository.attributes = params[:repository]
+      end
       if @project.save
-        @project.enabled_module_names = params[:enabled_modules]
         flash[:notice] = l(:notice_successful_create)
         redirect_to :controller => 'admin', :action => 'projects'
 	  end		
@@ -80,28 +77,23 @@ class ProjectsController < ApplicationController
 	
   # Show @project
   def show
-    @custom_values = @project.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
+    @custom_values = @project.custom_values.find(:all, :include => :custom_field)
-    @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
+    @members = @project.members.find(:all, :include => [:user, :role])
-    @subprojects = @project.active_children
+    @subprojects = @project.children if @project.children.size > 0
-    @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
+    @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
-    @trackers = @project.trackers
+    @trackers = Tracker.find(:all, :order => 'position')
-    @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
+    @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN issue_statuses ON issue_statuses.id = issues.status_id", :conditions => ["project_id=? and issue_statuses.is_closed=?", @project.id, false])
     @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
-    @total_hours = @project.time_entries.sum(:hours)
-    @key = User.current.rss_key
   end
 
   def settings
-    @root_projects = Project.find(:all,
+    @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
-                                  :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
-                                  :order => 'name')
     @custom_fields = IssueCustomField.find(:all)
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
-    @trackers = Tracker.all
+    @roles = Role.find(:all, :order => 'position')
-    @custom_values ||= ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
+    @users = User.find_active(:all) - @project.users
-    @repository ||= @project.repository
+    @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
-    @wiki ||= @project.wiki
   end
   
   # Edit @project
@@ -109,9 +101,18 @@ class ProjectsController < ApplicationController
     if request.post?
       @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
       if params[:custom_fields]
-        @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
+        @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
         @project.custom_values = @custom_values
       end
+      if params[:repository_enabled]
+        case params[:repository_enabled]
+        when "0"
+          @project.repository = nil
+        when "1"
+          @project.repository ||= Repository.new
+          @project.repository.attributes = params[:repository]
+        end
+      end
       @project.attributes = params[:project]
       if @project.save
         flash[:notice] = l(:notice_successful_update)
@@ -123,47 +124,24 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def modules
-    @project.enabled_module_names = params[:enabled_modules]
-    redirect_to :action => 'settings', :id => @project, :tab => 'modules'
-  end
-
-  def archive
-    @project.archive if request.post? && @project.active?
-    redirect_to :controller => 'admin', :action => 'projects'
-  end
-  
-  def unarchive
-    @project.unarchive if request.post? && !@project.active?
-    redirect_to :controller => 'admin', :action => 'projects'
-  end
-  
   # Delete @project
   def destroy
-    @project_to_destroy = @project
     if request.post? and params[:confirm]
-      @project_to_destroy.destroy
+      @project.destroy
       redirect_to :controller => 'admin', :action => 'projects'
     end
-    # hide project in layout
-    @project = nil
   end
 	
   # Add a new issue category to @project
   def add_issue_category
-    @category = @project.issue_categories.build(params[:category])
+    if request.post?
-    if request.post? and @category.save
+      @issue_category = @project.issue_categories.build(params[:issue_category])
-  	  respond_to do |format|
+      if @issue_category.save
-        format.html do
+        flash[:notice] = l(:notice_successful_create)
-          flash[:notice] = l(:notice_successful_create)
+        redirect_to :action => 'settings', :tab => 'categories', :id => @project
-          redirect_to :action => 'settings', :tab => 'categories', :id => @project
+      else
-        end
+        settings
-        format.js do
+        render :action => 'settings'
-          # IE doesn't support the replace_html rjs method for select box options
-          render(:update) {|page| page.replace "issue_category_id",
-            content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
-          }
-        end
       end
     end
   end	
@@ -177,171 +155,235 @@ class ProjectsController < ApplicationController
   	end
   end
 
+  # Add a new member to @project
+  def add_member
+    @member = @project.members.build(params[:member])
+  	if request.post?
+      if @member.save
+        flash[:notice] = l(:notice_successful_create)
+        redirect_to :action => 'settings', :tab => 'members', :id => @project
+      else		
+        settings
+        render :action => 'settings'
+      end
+    end
+  end
+
+  # Show members list of @project
+  def list_members
+    @members = @project.members.find(:all)
+  end
+
   # Add a new document to @project
   def add_document
+    @categories = Enumeration::get_values('DCAT')
     @document = @project.documents.build(params[:document])    
     if request.post? and @document.save	
       # Save the attachments
       params[:attachments].each { |a|
-        Attachment.create(:container => @document, :file => a, :author => User.current) unless a.size == 0
+        Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
       } if params[:attachments] and params[:attachments].is_a? Array
       flash[:notice] = l(:notice_successful_create)
-      Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
+      Mailer.deliver_document_add(@document) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
       redirect_to :action => 'list_documents', :id => @project
     end
   end
   
   # Show documents list of @project
   def list_documents
-    @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
+    @documents = @project.documents.find :all, :include => :category
-    documents = @project.documents.find :all, :include => [:attachments, :category]
-    case @sort_by
-    when 'date'
-      @grouped = documents.group_by {|d| d.created_on.to_date }
-    when 'title'
-      @grouped = documents.group_by {|d| d.title.first.upcase}
-    when 'author'
-      @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
-    else
-      @grouped = documents.group_by(&:category)
-    end
-    render :layout => false if request.xhr?
   end
 
   # Add a new issue to @project
-  # The new issue will be created from an existing one if copy_from parameter is given
   def add_issue
-    @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
+    @tracker = Tracker.find(params[:tracker_id])
-    @issue.project = @project
+    @priorities = Enumeration::get_values('IPRI')
-    @issue.author = User.current
+    @issue = Issue.new(:project => @project, :tracker => @tracker)
-    @issue.tracker ||= @project.trackers.find(params[:tracker_id])
-    
-    default_status = IssueStatus.default
-    unless default_status
-      flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
-      render :nothing => true, :layout => true
-      return
-    end    
-    @issue.status = default_status
-    @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker))
-    
     if request.get?
-      @issue.start_date ||= Date.today
+      @issue.start_date = Date.today
-      @custom_values = @issue.custom_values.empty? ?
+      @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
-        @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
-        @issue.custom_values
     else
-      requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
+      @issue.attributes = params[:issue]
-      # Check that the user is allowed to apply the requested status
+      @issue.author_id = self.logged_in_user.id if self.logged_in_user
-      @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
+      # Multiple file upload
-      @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]) }
+      @attachments = []
+      params[:attachments].each { |a|
+        @attachments << Attachment.new(:container => @issue, :file => a, :author => logged_in_user) unless a.size == 0
+      } if params[:attachments] and params[:attachments].is_a? Array
+      @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
       @issue.custom_values = @custom_values
       if @issue.save
-        if params[:attachments] && params[:attachments].is_a?(Array)
+        @attachments.each(&:save)
-          # Save attachments
-          params[:attachments].each {|a| Attachment.create(:container => @issue, :file => a, :author => User.current) unless a.size == 0}
-        end
         flash[:notice] = l(:notice_successful_create)
-        Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
+        Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-        redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+        redirect_to :action => 'list_issues', :id => @project
-        return
       end		
     end	
-    @priorities = Enumeration::get_values('IPRI')
   end
 
-  # Bulk edit issues
+  # Show filtered/sorted issues list of @project
-  def bulk_edit_issues
+  def list_issues
-    if request.post?
+    sort_init 'issues.id', 'desc'
-      status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
+    sort_update
-      priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
+
-      assigned_to = params[:assigned_to_id].blank? ? nil : User.find_by_id(params[:assigned_to_id])
+    retrieve_query
-      category = params[:category_id].blank? ? nil : @project.issue_categories.find_by_id(params[:category_id])
+
-      fixed_version = params[:fixed_version_id].blank? ? nil : @project.versions.find_by_id(params[:fixed_version_id])
+    @results_per_page_options = [ 15, 25, 50, 100 ]
-      issues = @project.issues.find_all_by_id(params[:issue_ids])
+    if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
-      unsaved_issue_ids = []      
+      @results_per_page = params[:per_page].to_i
-      issues.each do |issue|
+      session[:results_per_page] = @results_per_page
-        journal = issue.init_journal(User.current, params[:notes])
+    else
-        issue.priority = priority if priority
+      @results_per_page = session[:results_per_page] || 25
-        issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
+    end
-        issue.category = category if category
+
-        issue.fixed_version = fixed_version if fixed_version
+    if @query.valid?
-        issue.start_date = params[:start_date] unless params[:start_date].blank?
+      @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)		
-        issue.due_date = params[:due_date] unless params[:due_date].blank?
+      @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']								
-        issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
+      @issues = Issue.find :all, :order => sort_clause,
-        # Don't save any change to the issue if the user is not authorized to apply the requested status
+  						:include => [ :author, :status, :tracker, :project, :priority ],
-        if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
+  						:conditions => @query.statement,
-          # Send notification for each issue (if changed)
+  						:limit  =>  @issue_pages.items_per_page,
-          Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
+  						:offset =>  @issue_pages.current.offset						
-        else
+    end    
-          # Keep unsaved issue ids to display them in flash error
+    @trackers = Tracker.find :all, :order => 'position'
-          unsaved_issue_ids << issue.id
+    render :layout => false if request.xhr?
+  end
+
+  # Export filtered/sorted issues list to CSV
+  def export_issues_csv
+    sort_init 'issues.id', 'desc'
+    sort_update
+
+    retrieve_query
+    render :action => 'list_issues' and return unless @query.valid?
+					
+    @issues =  Issue.find :all, :order => sort_clause,
+						:include => [ :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
+						:conditions => @query.statement,
+						:limit => Setting.issues_export_limit
+
+    ic = Iconv.new('ISO-8859-1', 'UTF-8')    
+    export = StringIO.new
+    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
+      # csv header fields
+      headers = [ "#", l(:field_status), 
+                       l(:field_tracker),
+                       l(:field_priority),
+                       l(:field_subject),
+                       l(:field_author),
+                       l(:field_start_date),
+                       l(:field_due_date),
+                       l(:field_done_ratio),
+                       l(:field_created_on),
+                       l(:field_updated_on)
+                       ]
+      for custom_field in @project.all_custom_fields
+        headers << custom_field.name
+      end      
+      csv << headers.collect {|c| ic.iconv(c) }
+      # csv lines
+      @issues.each do |issue|
+        fields = [issue.id, issue.status.name, 
+                            issue.tracker.name, 
+                            issue.priority.name,
+                            issue.subject, 
+                            issue.author.display_name,
+                            issue.start_date ? l_date(issue.start_date) : nil,
+                            issue.due_date ? l_date(issue.due_date) : nil,
+                            issue.done_ratio,
+                            l_datetime(issue.created_on),  
+                            l_datetime(issue.updated_on)
+                            ]
+        for custom_field in @project.all_custom_fields
+          fields << (show_value issue.custom_value_for(custom_field))
         end
+        csv << fields.collect {|c| ic.iconv(c.to_s) }
       end
-      if unsaved_issue_ids.empty?
-        flash[:notice] = l(:notice_successful_update) unless issues.empty?
-      else
-        flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, issues.size, '#' + unsaved_issue_ids.join(', #'))
-      end
-      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
-      return
-    end
-    if current_role && User.current.allowed_to?(:change_issue_status, @project)
-      # Find potential statuses the user could be allowed to switch issues to
-      @available_statuses = Workflow.find(:all, :include => :new_status,
-                                                :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
-    end
-    render :update do |page|
-      page.hide 'query_form'
-      page.replace_html  'bulk-edit', :partial => 'issues/bulk_edit_form'
     end
+    export.rewind
+    send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
+  end
+  
+  # Export filtered/sorted issues to PDF
+  def export_issues_pdf
+    sort_init 'issues.id', 'desc'
+    sort_update
+
+    retrieve_query
+    render :action => 'list_issues' and return unless @query.valid?
+					
+    @issues =  Issue.find :all, :order => sort_clause,
+						:include => [ :author, :status, :tracker, :priority ],
+						:conditions => @query.statement,
+						:limit => Setting.issues_export_limit
+											
+    @options_for_rfpdf ||= {}
+    @options_for_rfpdf[:file_name] = "export.pdf"
+    render :layout => false
   end
 
   def move_issues
     @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
-    redirect_to :controller => 'issues', :action => 'index', :project_id => @project and return unless @issues
+    redirect_to :action => 'list_issues', :id => @project and return unless @issues
-    
     @projects = []
     # find projects to which the user is allowed to move the issue
-    if User.current.admin?
+    @logged_in_user.memberships.each {|m| @projects << m.project if Permission.allowed_to_role("projects/move_issues", m.role_id)}
-      # admin is allowed to move issues to any active (visible) project
+    # issue can be moved to any tracker
-      @projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
+    @trackers = Tracker.find(:all)
-    else
+    if request.post? and params[:new_project_id] and params[:new_tracker_id]    
-      User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:move_issues)}
+      new_project = Project.find(params[:new_project_id])
+      new_tracker = Tracker.find(params[:new_tracker_id])
+      @issues.each { |i|
+        # project dependent properties
+        unless i.project_id == new_project.id
+          i.category = nil 
+          i.fixed_version = nil
+        end
+        # move the issue
+        i.project = new_project
+        i.tracker = new_tracker
+        i.save
+      }
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'list_issues', :id => @project
     end
-    @target_project = @projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
+  end
-    @target_project ||= @project    
+
-    @trackers = @target_project.trackers
+  def add_query
-    if request.post?
+    @query = Query.new(params[:query])
-      new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
+    @query.project = @project
-      unsaved_issue_ids = []
+    @query.user = logged_in_user
-      @issues.each do |issue|
+    
-        unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
+    params[:fields].each do |field|
-      end
+      @query.add_filter(field, params[:operators][field], params[:values][field])
-      if unsaved_issue_ids.empty?
+    end if params[:fields]
-        flash[:notice] = l(:notice_successful_update) unless @issues.empty?
+    
-      else
+    if request.post? and @query.save
-        flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
+      flash[:notice] = l(:notice_successful_create)
-      end
+      redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
-      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
-      return
     end    
     render :layout => false if request.xhr?
   end
 
   # Add a news to @project
   def add_news
-    @news = News.new(:project => @project, :author => User.current)
+    @news = News.new(:project => @project)
     if request.post?
       @news.attributes = params[:news]
+      @news.author_id = self.logged_in_user.id if self.logged_in_user
       if @news.save
         flash[:notice] = l(:notice_successful_create)
-        Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
+        redirect_to :action => 'list_news', :id => @project
-        redirect_to :controller => 'news', :action => 'index', :project_id => @project
       end
     end
   end
 
+  # Show news list of @project
+  def list_news
+    @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
+    render :action => "list_news", :layout => false if request.xhr?
+  end
+
   def add_file
     if request.post?
       @version = @project.versions.find_by_id(params[:version_id])
@@ -349,31 +391,48 @@ class ProjectsController < ApplicationController
       @attachments = []
       params[:attachments].each { |file|
         next unless file.size > 0
-        a = Attachment.create(:container => @version, :file => file, :author => User.current)
+        a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
         @attachments << a unless a.new_record?
       } if params[:attachments] and params[:attachments].is_a? Array
-      Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('file_added')
+      Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
     end
-    @versions = @project.versions.sort
+    @versions = @project.versions
   end
   
   def list_files
-    @versions = @project.versions.sort
+    @versions = @project.versions
   end
   
   # Show changelog for @project
   def changelog
-    @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
+    @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)    
+    if request.get?
-    @versions = @project.versions.sort
+      @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
+    else
+      @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
+    end
+    @selected_tracker_ids ||= []
+    @fixed_issues = @project.issues.find(:all, 
+      :include => [ :fixed_version, :status, :tracker ], 
+      :conditions => [ "issue_statuses.is_closed=? and issues.tracker_id in (#{@selected_tracker_ids.join(',')}) and issues.fixed_version_id is not null", true],
+      :order => "versions.effective_date DESC, issues.id DESC"
+    ) unless @selected_tracker_ids.empty?
+    @fixed_issues ||= []
   end
 
   def roadmap
-    @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
+    @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
+    if request.get?
-    @versions = @project.versions.sort
+      @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
-    @versions = @versions.select {|v| !v.completed? } unless params[:completed]
+    else
+      @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
+    end
+    @selected_tracker_ids ||= []
+    @versions = @project.versions.find(:all,
+      :conditions => [ "versions.effective_date>?", Date.today],
+      :order => "versions.effective_date ASC"
+    )
   end
   
   def activity
@@ -386,83 +445,51 @@ class ProjectsController < ApplicationController
     @year ||= Date.today.year
     @month ||= Date.today.month
 
-    case params[:format]
+    @date_from = Date.civil(@year, @month, 1)
-    when 'atom'
+    @date_to = (@date_from >> 1)-1
-      # 30 last days
+    
-      @date_from = Date.today - 30
+    @events_by_day = {}    
-      @date_to = Date.today + 1
+    
-    else
+    unless params[:show_issues] == "0"
-      # current month
+      @project.issues.find(:all, :include => [:author, :status], :conditions => ["issues.created_on>=? and issues.created_on<=?", @date_from, @date_to] ).each { |i|
-      @date_from = Date.civil(@year, @month, 1)
+        @events_by_day[i.created_on.to_date] ||= []
-      @date_to = @date_from >> 1
+        @events_by_day[i.created_on.to_date] << i
+      }
+      @show_issues = 1
     end
     
-    @event_types = %w(issues news files documents changesets wiki_pages messages)
+    unless params[:show_news] == "0"
-    @event_types.delete('wiki_pages') unless @project.wiki
+      @project.news.find(:all, :conditions => ["news.created_on>=? and news.created_on<=?", @date_from, @date_to], :include => :author ).each { |i|
-    @event_types.delete('changesets') unless @project.repository
+        @events_by_day[i.created_on.to_date] ||= []
-    @event_types.delete('messages') unless @project.boards.any?
+        @events_by_day[i.created_on.to_date] << i
-    # only show what the user is allowed to view
+      }
-    @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
+      @show_news = 1 
-    
-    @scope = @event_types.select {|t| params["show_#{t}"]}
-    # default events if none is specified in parameters
-    @scope = (@event_types - %w(wiki_pages messages))if @scope.empty?
-    
-    @events = []    
-    
-    if @scope.include?('issues')
-      @events += @project.issues.find(:all, :include => [:author, :tracker], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] )
-      @events += @project.issues_status_changes(@date_from, @date_to)
     end
     
-    if @scope.include?('news')
+    unless params[:show_files] == "0"
-      @events += @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author )
+      Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN versions ON versions.id = attachments.container_id", :conditions => ["attachments.container_type='Version' and versions.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
+        @events_by_day[i.created_on.to_date] ||= []
+        @events_by_day[i.created_on.to_date] << i
+      }
+      @show_files = 1 
     end
     
-    if @scope.include?('files')
+    unless params[:show_documents] == "0"
-      @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
+      @project.documents.find(:all, :conditions => ["documents.created_on>=? and documents.created_on<=?", @date_from, @date_to] ).each { |i|
+        @events_by_day[i.created_on.to_date] ||= []
+        @events_by_day[i.created_on.to_date] << i
+      }
+      Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
+        @events_by_day[i.created_on.to_date] ||= []
+        @events_by_day[i.created_on.to_date] << i
+      }
+      @show_documents = 1 
     end
     
-    if @scope.include?('documents')
+    render :layout => false if request.xhr?
-      @events += @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.created_on<=?", @date_from, @date_to] )
-      @events += Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
-    end
-    
-    if @scope.include?('wiki_pages')
-      select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
-               "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
-               "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
-               "#{WikiContent.versioned_table_name}.id"
-      joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
-              "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
-      conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
-                    @project.id, @date_from, @date_to]
-
-      @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions)
-    end
-
-    if @scope.include?('changesets')
-      @events += Changeset.find(:all, :include => :repository, :conditions => ["#{Repository.table_name}.project_id = ? AND #{Changeset.table_name}.committed_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
-    end
-    
-    if @scope.include?('messages')
-      @events += Message.find(:all, 
-                              :include => [:board, :author], 
-                              :conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.parent_id IS NULL AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
-    end
-    
-    @events_by_day = @events.group_by(&:event_date)
-    
-    respond_to do |format|
-      format.html { render :layout => false if request.xhr? }
-      format.atom { render_feed(@events, :title => "#{@project.name}: #{l(:label_activity)}") }
-    end
   end
   
   def calendar
-    @trackers = Tracker.find(:all, :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
-    
     if params[:year] and params[:year].to_i > 1900
       @year = params[:year].to_i
       if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
@@ -471,25 +498,19 @@ class ProjectsController < ApplicationController
     end
     @year ||= Date.today.year
     @month ||= Date.today.month
-    @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
     
-    events = []
+    @date_from = Date.civil(@year, @month, 1)
-    @project.issues_with_subprojects(params[:with_subprojects]) do
+    @date_to = (@date_from >> 1)-1
-      events += Issue.find(:all, 
+    # start on monday
-                           :include => [:tracker, :status, :assigned_to, :priority, :project], 
+    @date_from = @date_from - (@date_from.cwday-1)
-                           :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
+    # finish on sunday
-                           ) unless @selected_tracker_ids.empty?
+    @date_to = @date_to + (7-@date_to.cwday)  
-    end
-    events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
-    @calendar.events = events
       
+    @issues = @project.issues.find(:all, :include => [:tracker, :status, :assigned_to, :priority], :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to])
     render :layout => false if request.xhr?
   end  
 
   def gantt
-    @trackers = Tracker.find(:all, :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
-    
     if params[:year] and params[:year].to_i >0
       @year_from = params[:year].to_i
       if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
@@ -498,43 +519,21 @@ class ProjectsController < ApplicationController
         @month_from = 1
       end
     else
-      @month_from ||= Date.today.month
+      @month_from ||= (Date.today << 1).month
-      @year_from ||= Date.today.year
+      @year_from ||= (Date.today << 1).year
     end
     
-    zoom = (params[:zoom] || User.current.pref[:gantt_zoom]).to_i
+    @zoom = (params[:zoom].to_i > 0 and params[:zoom].to_i < 5) ? params[:zoom].to_i : 2
-    @zoom = (zoom > 0 && zoom < 5) ? zoom : 2    
+    @months = (params[:months].to_i > 0 and params[:months].to_i < 25) ? params[:months].to_i : 6
-    months = (params[:months] || User.current.pref[:gantt_months]).to_i
-    @months = (months > 0 && months < 25) ? months : 6
-    
-    # Save gantt paramters as user preference (zoom and months count)
-    if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
-      User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
-      User.current.preference.save
-    end
     
     @date_from = Date.civil(@year_from, @month_from, 1)
     @date_to = (@date_from >> @months) - 1
+    @issues = @project.issues.find(:all, :order => "start_date, due_date", :include => [:tracker, :status, :assigned_to, :priority], :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to])
     
-    @events = []
+    if params[:output]=='pdf'
-    @project.issues_with_subprojects(params[:with_subprojects]) do
-      @events += Issue.find(:all, 
-                           :order => "start_date, due_date",
-                           :include => [:tracker, :status, :assigned_to, :priority, :project], 
-                           :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
-                           ) unless @selected_tracker_ids.empty?
-    end
-    @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
-    @events.sort! {|x,y| x.start_date <=> y.start_date }
-    
-    if params[:format]=='pdf'
       @options_for_rfpdf ||= {}
-      @options_for_rfpdf[:file_name] = "#{@project.identifier}-gantt.pdf"
+      @options_for_rfpdf[:file_name] = "gantt.pdf"
       render :template => "projects/gantt.rfpdf", :layout => false
-    elsif params[:format]=='png' && respond_to?('gantt_image')
-      image = gantt_image(@events, @date_from, @months, @zoom)
-      image.format = 'PNG'
-      send_data(image.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png")
     else
       render :template => "projects/gantt.rhtml"
     end
@@ -546,15 +545,34 @@ private
   # Used as a before_filter
   def find_project
     @project = Project.find(params[:id])
+    @html_title = @project.name
   rescue ActiveRecord::RecordNotFound
     render_404
   end
   
-  def retrieve_selected_tracker_ids(selectable_trackers)
+  # Retrieve query from session or build a new query
-    if ids = params[:tracker_ids]
+  def retrieve_query
-      @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
+    if params[:query_id]
+      @query = @project.queries.find(params[:query_id])
+      session[:query] = @query
     else
-      @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
+      if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
+        # Give it a name, required to be valid
+        @query = Query.new(:name => "_")
+        @query.project = @project
+        if params[:fields] and params[:fields].is_a? Array
+          params[:fields].each do |field|
+            @query.add_filter(field, params[:operators][field], params[:values][field])
+          end
+        else
+          @query.available_filters.keys.each do |field|
+            @query.add_short_filter(field, params[field]) if params[field]
+          end
+        end
+        session[:query] = @query
+      else
+        @query = session[:query]
+      end
     end  
   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
@@ -17,32 +17,7 @@
 
 class QueriesController < ApplicationController
   layout 'base'
-  before_filter :find_project, :authorize
+  before_filter :require_login, :find_query
-
-  def index
-    @queries = @project.queries.find(:all, 
-                                     :order => "name ASC",
-                                     :conditions => ["is_public = ? or user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
-  end
-  
-  def new
-    @query = Query.new(params[:query])
-    @query.project = @project
-    @query.user = User.current
-    @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
-    @query.column_names = nil if params[:default_columns]
-    
-    params[:fields].each do |field|
-      @query.add_filter(field, params[:operators][field], params[:values][field])
-    end if params[:fields]
-    
-    if request.post? && params[:confirm] && @query.save
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
-      return
-    end
-    render :layout => false if request.xhr?
-  end
 
   def edit
     if request.post?
@@ -51,30 +26,25 @@ 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 current_role.allowed_to?(:manage_public_queries)
-      @query.column_names = nil if params[:default_columns]
           
       if @query.save
         flash[:notice] = l(:notice_successful_update)
-        redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
+        redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
       end
     end
   end
 
   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
-      @project = @query.project
+    # check if user is allowed to manage queries (same permission as add_query)
-      render_403 unless @query.editable_by?(User.current)
+    authorize('projects', 'add_query')
-    else
-      @project = Project.find(params[:project_id])
-    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end

app/controllers/reports_controller.rb

@@ -25,16 +25,10 @@ class ReportsController < ApplicationController
     case params[:detail]
     when "tracker"
       @field = "tracker_id"
-      @rows = @project.trackers
+      @rows = Tracker.find :all, :order => 'position'
       @data = issues_by_tracker
       @report_title = l(:field_tracker)
       render :template => "reports/issue_report_details"
-    when "version"
-      @field = "fixed_version_id"
-      @rows = @project.versions.sort
-      @data = issues_by_version
-      @report_title = l(:field_version)
-      render :template => "reports/issue_report_details"
     when "priority"
       @field = "priority_id"
       @rows = Enumeration::get_values('IPRI')
@@ -53,26 +47,16 @@ class ReportsController < ApplicationController
       @data = issues_by_author
       @report_title = l(:field_author)
       render :template => "reports/issue_report_details"  
-    when "subproject"
-      @field = "project_id"
-      @rows = @project.active_children
-      @data = issues_by_subproject
-      @report_title = l(:field_subproject)
-      render :template => "reports/issue_report_details"  
     else
-      @trackers = @project.trackers
+      @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
-      @versions = @project.versions.sort
+      @trackers = Tracker.find(:all, :order => 'position')
       @priorities = Enumeration::get_values('IPRI')
       @categories = @project.issue_categories
       @authors = @project.members.collect { |m| m.user }
-      @subprojects = @project.active_children
       issues_by_tracker
-      issues_by_version
       issues_by_priority
       issues_by_category
       issues_by_author
-      issues_by_subproject
-      
       render :template => "reports/issue_report"
     end
   end  
@@ -128,7 +112,7 @@ private
                                                   t.id as tracker_id,
                                                   count(i.id) as total 
                                                 from 
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Tracker.table_name} t
+                                                  issues i, issue_statuses s, trackers t
                                                 where 
                                                   i.status_id=s.id 
                                                   and i.tracker_id=t.id
@@ -136,21 +120,6 @@ private
                                                 group by s.id, s.is_closed, t.id")	
   end
 	
-  def issues_by_version
-    @issues_by_version ||= 
-        ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
-                                                  s.is_closed as closed, 
-                                                  v.id as fixed_version_id,
-                                                  count(i.id) as total 
-                                                from 
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Version.table_name} v
-                                                where 
-                                                  i.status_id=s.id 
-                                                  and i.fixed_version_id=v.id
-                                                  and i.project_id=#{@project.id}
-                                                group by s.id, s.is_closed, v.id")	
-  end
-  	
   def issues_by_priority    
     @issues_by_priority ||= 
       ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
@@ -158,7 +127,7 @@ private
                                                   p.id as priority_id,
                                                   count(i.id) as total 
                                                 from 
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Enumeration.table_name} p
+                                                  issues i, issue_statuses s, enumerations p
                                                 where 
                                                   i.status_id=s.id 
                                                   and i.priority_id=p.id
@@ -173,7 +142,7 @@ private
                                                   c.id as category_id,
                                                   count(i.id) as total 
                                                 from 
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{IssueCategory.table_name} c
+                                                  issues i, issue_statuses s, issue_categories c
                                                 where 
                                                   i.status_id=s.id 
                                                   and i.category_id=c.id
@@ -188,26 +157,11 @@ private
                                                   a.id as author_id,
                                                   count(i.id) as total 
                                                 from 
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{User.table_name} a
+                                                  issues i, issue_statuses s, users 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,263 +15,60 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'SVG/Graph/Bar'
-require 'SVG/Graph/BarHorizontal'
-require 'digest/sha1'
-
-class ChangesetNotFound < Exception
-end
-
 class RepositoriesController < ApplicationController
   layout 'base'
-  before_filter :find_repository, :except => :edit
+  before_filter :find_project, :authorize
-  before_filter :find_project, :only => :edit
-  before_filter :authorize
-  accept_key_auth :revisions
-  
-  def edit
-    @repository = @project.repository
-    if !@repository
-      @repository = Repository.factory(params[:repository_scm])
-      @repository.project = @project
-    end
-    if request.post?
-      @repository.attributes = params[:repository]
-      @repository.save
-    end
-    render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
-  end
-  
-  def destroy
-    @repository.destroy
-    redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
-  end
 
   def show
-    # check if new revisions have been committed in the repository
+    @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)
-    if request.xhr?
+    show_error and return unless @entries
-      @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
-    else
-      show_error unless @entries
-    end
-  end
-  
-  def changes
-    @entry = @repository.scm.entry(@path, @rev)
-    show_error and return unless @entry
-    @changesets = @repository.changesets_for_path(@path)
   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)
-
-    respond_to do |format|
-      format.html { render :layout => false if request.xhr? }
-      format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
-    end
   end
   
   def entry
-    @content = @repository.scm.cat(@path, @rev)
-    show_error and return unless @content
     if 'raw' == params[:format]
-      send_data @content, :filename => @path.split('/').last
+      content = @repository.scm.cat(@path, @rev)
+      show_error and return unless content
+      send_data content, :filename => @path.split('/').last
     end
   end
   
-  def annotate
-    @annotate = @repository.scm.annotate(@path, @rev)
-    show_error and return if @annotate.nil? || @annotate.empty?
-  end
-  
   def revision
-    @changeset = @repository.changesets.find_by_revision(@rev)
+    @revisions = @repository.scm.revisions '', @rev, @rev, :with_paths => true
-    raise ChangesetNotFound 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)
-
-    respond_to do |format|
-      format.html
-      format.js {render :layout => false}
-    end
-  rescue ChangesetNotFound
-    show_error
   end
   
   def diff
-    @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1)
+    @rev_to = params[:rev_to] || (@rev-1)
-    @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
+    @diff = @repository.scm.diff(params[:path], @rev, @rev_to)
-    @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
+    show_error and return unless @diff
-    
-    # Save diff type as user preference
-    if User.current.logged? && @diff_type != User.current.pref[:diff_type]
-      User.current.pref[:diff_type] = @diff_type
-      User.current.preference.save
-    end
-    
-    @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")    
-    unless read_fragment(@cache_key)
-      @diff = @repository.diff(@path, @rev, @rev_to, @diff_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
   
 private
   def find_project
     @project = Project.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-  
-  def find_repository
-    @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].join('/') unless params[:path].nil?
     @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
 
   def show_error
-    flash.now[:error] = l(:notice_scm_error)
+    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 << 11
-    @date_from = Date.civil(@date_from.year, @date_from.month, 1)
-    commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
-    commits_by_month = [0] * 12
-    commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
-
-    changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
-    changes_by_month = [0] * 12
-    changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
-   
-    fields = []
-    month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
-    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

@@ -28,36 +28,40 @@ class RolesController < ApplicationController
   end
 
   def list
-    @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
+    @role_pages, @roles = paginate :roles, :per_page => 10, :order => "position"
     render :action => "list", :layout => false if request.xhr?
   end
 
   def new
-    # Prefills the form with 'Non member' role permissions
+    @role = Role.new(params[:role])
-    @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
+    if request.post?
-    if request.post? && @role.save
+      @role.permissions = Permission.find(params[:permission_ids]) if params[:permission_ids]
-      flash[:notice] = l(:notice_successful_create)
+      if @role.save
-      redirect_to :action => 'list'
+        flash[:notice] = l(:notice_successful_create)
+        redirect_to :action => 'list'
+      end
     end
-    @permissions = @role.setable_permissions
+    @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
   end
 
   def edit
     @role = Role.find(params[:id])
     if request.post? and @role.update_attributes(params[:role])
+      @role.permissions = Permission.find(params[:permission_ids] || [])
+      Permission.allowed_to_role_expired
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'list'
     end
-    @permissions = @role.setable_permissions
+    @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
   end
 
   def destroy
     @role = Role.find(params[:id])
-    #unless @role.members.empty?
+    unless @role.members.empty?
-    #  flash[:error] = 'Some members have this role. Can\'t delete it.'
+      flash[:notice] = 'Some members have this role. Can\'t delete it.'
-    #else
+    else
       @role.destroy
-    #end
+    end
     redirect_to :action => 'list'
   end
   
@@ -89,24 +93,10 @@ class RolesController < ApplicationController
       }
       if @role.save
         flash[:notice] = l(:notice_successful_update)
-        redirect_to :action => 'workflow', :role_id => @role, :tracker_id => @tracker
       end
     end
-    @roles = Role.find(:all, :order => 'builtin, position')
+    @roles = Role.find(:all, :order => 'position')
     @trackers = Tracker.find(:all, :order => 'position')
-    @statuses = IssueStatus.find(:all, :order => 'position')
+    @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')
-  end
-  
-  def report    
-    @roles = Role.find(:all, :order => 'builtin, position')
-    @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
-    if request.post?
-      @roles.each do |role|
-        role.permissions = params[:permissions][role.id.to_s]
-        role.save
-      end
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'list'
-    end
   end
 end

app/controllers/search_controller.rb

@@ -1,112 +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)
-    @titles_only = !params[:titles_only].nil?
-    
-    offset = nil
-    begin; offset = params[:offset].to_time if params[:offset]; rescue; end
-    
-    # quick jump to an issue
-    if @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(User.current))
-      redirect_to :controller => "issues", :action => "show", :id => $1
-      return
-    end
-    
-    if params[:id]
-      find_project
-      return unless check_project_privacy
-    end
-    
-    if @project
-      # only show what the user is allowed to view
-      @object_types = %w(issues news documents changesets wiki_pages messages)
-      @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
-      
-      @scope = @object_types.select {|t| params[t]}
-      @scope = @object_types if @scope.empty?
-    else
-      @object_types = @scope = %w(projects)
-    end
-    
-    # extract tokens from the question
-    # eg. hello "bye bye" => ["hello", "bye bye"]
-    @tokens = @question.scan(%r{((\s|^)"[\s\w]+"(\s|$)|\S+)}).collect {|m| m.first.gsub(%r{(^\s*"\s*|\s*"\s*$)}, '')}
-    # tokens must be at least 3 character long
-    @tokens = @tokens.uniq.select {|w| w.length > 2 }
-    
-    if !@tokens.empty?
-      # no more than 5 tokens to search for
-      @tokens.slice! 5..-1 if @tokens.size > 5
-      # strings used in sql like statement
-      like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}      
-      @results = []
-      limit = 10
-      if @project        
-        @scope.each do |s|
-          @results += s.singularize.camelcase.constantize.search(like_tokens, @project,
-            :all_words => @all_words,
-            :titles_only => @titles_only,
-            :limit => (limit+1),
-            :offset => offset,
-            :before => params[:previous].nil?)
-        end
-        @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
-        if params[:previous].nil?
-          @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
-          if @results.size > limit
-            @pagination_next_date = @results[limit-1].event_datetime 
-            @results = @results[0, limit]
-          end
-        else
-          @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
-          if @results.size > limit
-            @pagination_previous_date = @results[-(limit)].event_datetime 
-            @results = @results[-(limit), limit]
-          end
-        end
-      else
-        operator = @all_words ? ' AND ' : ' OR '
-        @results += Project.find(:all, 
-                                 :limit => limit,
-                                 :conditions => [ (["(#{Project.visible_by(User.current)}) AND (LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort]
-                                 ) if @scope.include? 'projects'
-        # 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
-    else
-      @question = ""
-    end
-    render :layout => false if request.xhr?
-  end
-
-private  
-  def find_project
-    @project = Project.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/controllers/settings_controller.rb

@@ -30,16 +30,4 @@ class SettingsController < ApplicationController
       redirect_to :action => 'edit' and return
     end
   end
-  
-  def plugin
-    plugin_id = params[:id].to_sym
-    @plugin = Redmine::Plugin.registered_plugins[plugin_id]
-    if request.post?
-      Setting["plugin_#{plugin_id}"] = params[:settings]
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'plugin', :id => params[:id]
-    end
-    @partial = "../../vendor/plugins/#{plugin_id}/app/views/" + @plugin.settings[:partial]
-    @settings = Setting["plugin_#{plugin_id}"]
-  end
 end

app/controllers/sys_controller.rb

@@ -1,47 +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
-  
-  # Returns the projects list, with their repositories
-  def projects
-    Project.find(:all, :include => :repository)
-  end
-
-  # Registers a repository for the given project identifier
-  # (Subversion specific)
-  def repository_created(identifier, url)
-    project = Project.find_by_identifier(identifier)
-    # Do not create the repository if the project has already one
-    return 0 unless project && project.repository.nil?
-    logger.debug "Repository for #{project.name} was created"
-    repository = Repository.factory('Subversion', :project => project, :url => url)
-    repository.save
-    repository.id || 0
-  end
-
-protected
-
-  def check_enabled(name, args)
-    Setting.sys_api_enabled?
-  end
-end

app/controllers/timelog_controller.rb

@@ -1,172 +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, :authorize
-
-  helper :sort
-  include SortHelper
-  helper :issues
-  
-  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 = User.current.id
-    
-    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 != User.current
-    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
-    @time_entry.attributes = params[:time_entry]
-    if request.post? and @time_entry.save
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :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

@@ -35,18 +35,9 @@ class TrackersController < ApplicationController
   def new
     @tracker = Tracker.new(params[:tracker])
     if request.post? and @tracker.save
-      # workflow copy
-      if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
-        Workflow.transaction do
-          copy_from.workflows.find(:all, :include => [:role, :old_status, :new_status]).each do |w|
-            Workflow.create(:tracker_id => @tracker.id, :role => w.role, :old_status => w.old_status, :new_status => w.new_status)
-          end
-        end
-      end
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'list'
     end
-    @trackers = Tracker.find :all
   end
 
   def edit
@@ -75,7 +66,7 @@ class TrackersController < ApplicationController
   def destroy
     @tracker = Tracker.find(params[:id])
     unless @tracker.issues.empty?
-      flash[:error] = "This tracker contains issues and can\'t be deleted."
+      flash[:notice] = "This tracker contains issues and can\'t be deleted."
     else
       @tracker.destroy
     end

app/controllers/users_controller.rb

@@ -32,17 +32,11 @@ class UsersController < ApplicationController
   def list
     sort_init 'login', 'asc'
     sort_update
-    
+    @user_count = User.count		
-    @status = params[:status] ? params[:status].to_i : 1    
-    conditions = nil
-    conditions = ["status=?", @status] unless @status == 0
-    
-    @user_count = User.count(:conditions => conditions)
     @user_pages = Paginator.new self, @user_count,
 								15,
 								params['page']								
     @users =  User.find :all,:order => sort_clause,
-                        :conditions => conditions,
 						:limit  =>  @user_pages.items_per_page,
 						:offset =>  @user_pages.current.offset
 
@@ -52,16 +46,15 @@ class UsersController < ApplicationController
   def add
     if request.get?
       @user = User.new(:language => Setting.default_language)
-      @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").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.admin = params[:user][:admin] || false
       @user.login = params[:user][:login]
       @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
-      @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
+      @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			
       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
@@ -72,13 +65,13 @@ class UsersController < ApplicationController
   def edit
     @user = User.find(params[:id])
     if request.get?
-      @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").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
       @user.admin = params[:user][:admin] if params[:user][:admin]
       @user.login = params[:user][:login] if params[:user][:login]
       @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
       if params[:custom_fields]
-        @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").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
       end
       if @user.update_attributes(params[:user])
@@ -87,8 +80,8 @@ class UsersController < ApplicationController
       end
     end
     @auth_sources = AuthSource.find(:all)
-    @roles = Role.find_all_givable
+    @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
   end
   
@@ -114,7 +107,7 @@ class UsersController < ApplicationController
     User.find(params[:id]).destroy
     redirect_to :action => 'list'
   rescue
-    flash[:error] = "Unable to delete user"
+    flash[:notice] = "Unable to delete user"
     redirect_to :action => 'list'
   end  
 end

app/controllers/versions_controller.rb

@@ -19,11 +19,6 @@ class VersionsController < ApplicationController
   layout 'base'
   before_filter :find_project, :authorize
 
-  cache_sweeper :version_sweeper, :only => [ :edit, :destroy ]
-  
-  def show
-  end
-  
   def edit
     if request.post? and @version.update_attributes(params[:version])
       flash[:notice] = l(:notice_successful_update)
@@ -35,14 +30,14 @@ class VersionsController < ApplicationController
     @version.destroy
     redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
   rescue
-    flash[:error] = "Unable to delete version"
+    flash[:notice] = "Unable to delete version"
     redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
   end
 
   def download
     @attachment = @version.attachments.find(params[:attachment_id])
     @attachment.increment_download
-    send_file @attachment.diskfile, :filename => @attachment.filename, :type => @attachment.content_type
+    send_file @attachment.diskfile, :filename => @attachment.filename
   rescue
     render_404
   end 
@@ -53,13 +48,6 @@ class VersionsController < ApplicationController
     redirect_to :controller => 'projects', :action => 'list_files', :id => @project
   end
 
-  def status_by
-    respond_to do |format|
-      format.html { render :action => 'show' }
-      format.js { render(:update) {|page| page.replace_html 'status_by', render_issue_status_by(@version, params[:status_by])} }
-    end
-  end
-
 private
   def find_project
     @version = Version.find(params[:id])

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 = User.current
-    @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 = User.current
-    @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

@@ -19,7 +19,7 @@ class WelcomeController < ApplicationController
   layout 'base'
 
   def index
-    @news = News.latest User.current
+    @news = News.latest logged_in_user
-    @projects = Project.latest User.current
+    @projects = Project.latest logged_in_user
   end
 end

app/controllers/wiki_controller.rb

@@ -1,180 +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, :authorize
-  
-  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?
-      if User.current.allowed_to?(:edit_wiki_pages, @project)
-        edit
-        render :action => 'edit'
-      else
-        render_404
-      end
-      return
-    end
-    @content = @page.content_for_version(params[:version])
-    if params[:export] == 'html'
-      export = render_to_string :action => 'export', :layout => false
-      send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
-      return
-    elsif params[:export] == 'txt'
-      send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
-      return
-    end
-    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 !@page.new_record? && @content.text == params[:content][:text]
-        # don't save if text wasn't changed
-        redirect_to :action => 'index', :id => @project, :page => @page.title
-        return
-      end
-      #@content.text = params[:content][:text]
-      #@content.comments = params[:content][:comments]
-      @content.attributes = params[:content]
-      @content.author = User.current
-      # if page is new @page.save will also save content, but not if page isn't a new record
-      if (@page.new_record? ? @page.save : @content.save)
-        redirect_to :action => 'index', :id => @project, :page => @page.title
-      end
-    end
-  rescue ActiveRecord::StaleObjectError
-    # Optimistic locking exception
-    flash[:error] = l(:notice_locking_conflict)
-  end
-  
-  # rename a page
-  def rename
-    @page = @wiki.find_page(params[:page])    
-    @page.redirect_existing_links = true
-    # used to display the *original* title if some AR validation errors occur
-    @original_title = @page.pretty_title
-    if request.post? && @page.update_attributes(params[:wiki_page])
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'index', :id => @project, :page => @page.title
-    end
-  end
-  
-  # 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', 'date_index'
-      # eager load information about last updates, without loading text
-      @pages = @wiki.pages.find :all, :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
-                                      :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
-                                      :order => 'title'
-      @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
-    # 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 => 'common/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 => User.current)
-    } 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/controllers/wikis_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 WikisController < ApplicationController
-  layout 'base'
-  before_filter :find_project, :authorize
-  
-  # Create or update a project's wiki
-  def edit
-    @wiki = @project.wiki || Wiki.new(:project => @project)
-    @wiki.attributes = params[:wiki]
-    @wiki.save if @request.post?
-    render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'}
-  end
-
-  # Delete a project's wiki
-  def destroy
-    if request.post? && params[:confirm] && @project.wiki
-      @project.wiki.destroy
-      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'wiki'
-    end    
-  end
-  
-private
-  def find_project
-    @project = Project.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

app/helpers/admin_helper.rb

@@ -16,8 +16,4 @@
 # 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

@@ -16,44 +16,38 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module ApplicationHelper
-  include Redmine::WikiFormatting::Macros::Definitions
 
-  def current_role
+  # Return current logged in user or nil
-    @current_role ||= User.current.role_for_project(@project)
+  def loggedin?
+    @logged_in_user
+  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)  
-    User.current.allowed_to?({:controller => controller, :action => action}, @project)
+    # 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] || params[:controller], options[:action])
+    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)
-    user ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
+    link_to user.display_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 show_and_goto_link(name, id, options={})
-    onclick = "Element.show('#{id}'); "
-    onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
-    onclick << "location.href='##{id}-anchor'; "
-    onclick << "return false;"
-    link_to(name, "#", options.merge(:onclick => onclick))
   end
   
   def image_to_function(name, function, html_options = {})
@@ -64,35 +58,12 @@ module ApplicationHelper
         }))
   end
   
-  def prompt_to_remote(name, text, param, url, html_options = {})
-    html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
-    link_to name, {}, html_options
-  end
-  
   def format_date(date)
-    return nil unless date
+    l_date(date) if date
-    # "Setting.date_format.size < 2" is a temporary fix (content of date_format setting changed)
-    @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
-    date.strftime(@date_format)
   end
   
-  def format_time(time, include_date = true)
+  def format_time(time)
-    return nil unless time
+    l_datetime(time) if time
-    time = time.to_time if time.is_a?(String)
-    zone = User.current.time_zone
-    if time.utc?
-      local = zone ? zone.adjust(time) : time.getlocal
-    else
-      local = zone ? zone.adjust(time.getutc) : time
-    end
-    @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
-    @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
-    include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
-  end
-  
-  def authoring(created, author)
-    time_tag = content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created))
-    l(:label_added_time_by, author || 'Anonymous', time_tag)
   end
   
   def day_name(day)
@@ -104,160 +75,25 @@ module ApplicationHelper
   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)},
+                            {:update => "content", :url => { :page => paginator.current.previous }},
-                            {:href => url_for(:params => options.merge(page_param => paginator.current.previous))}) + ' ' if 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 => {:params => options.merge(page_param => n)}, :update => 'content'},
+                      {:url => {:action => 'list', :params => params.merge({:page => n})}, :update => 'content'},
-                      {:href => url_for(:params => options.merge(page_param => n))})
+                      {:href => url_for(:action => 'list', :params => params.merge({:page => n}))})
     end || '')
     
     html << ' ' + link_to_remote((l(:label_next) + ' &#187;'), 
-                                 {:update => "content", :url => options.merge(page_param => paginator.current.next)},
+                                 {:update => "content", :url => { :page => paginator.current.next }},
-                                 {:href => url_for(:params => options.merge(page_param => paginator.current.next))}) if paginator.current.next
+                                 {:href => url_for(:action => 'list', :params => params.merge({:page => paginator.current.next}))}) if paginator.current.next
     html  
   end
   
-  def set_html_title(text)
+  def textilizable(text)
-    @html_header_title = 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 html_title
-    title = []
-    title << @project.name if @project
-    title << @html_header_title
-    title << Setting.app_title
-    title.compact.join(' - ')
-  end
-  
-  ACCESSKEYS = {:edit => 'e',
-                :preview => 'r',
-                :quick_search => 'f',
-                :search => '4',
-                }.freeze unless const_defined?(:ACCESSKEYS)
-
-  def accesskey(s)
-    ACCESSKEYS[s]
-  end
-
-  # Formats text according to system settings.
-  # 2 ways to call this method:
-  # * with a String: textilizable(text, options)
-  # * with an object and one of its attribute: textilizable(issue, :description, options)
-  def textilizable(*args)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    case args.size
-    when 1
-      obj = nil
-      text = args.shift || ''
-    when 2
-      obj = args.shift
-      text = obj.send(args.shift)
-    else
-      raise ArgumentError, 'invalid arguments to textilizable'
-    end
-
-    # 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 => 'download', :id => found.id
-          "!#{align}#{image_url}!"
-        else
-          "!#{align}#{filename}!"
-        end
-      end
-    end
-    
-    text = (Setting.text_formatting == 'textile') ?
-      Redmine::WikiFormatting.to_html(text) { |macro, args| exec_macro(macro, obj, args) } :
-      simple_format(auto_link(h(text)))
-
-    # different methods for formatting wiki links
-    case options[:wiki_links]
-    when :local
-      # used for local links to html files
-      format_wiki_link = Proc.new {|project, title| "#{title}.html" }
-    when :anchor
-      # used for single-file wiki export
-      format_wiki_link = Proc.new {|project, title| "##{title}" }
-    else
-      format_wiki_link = Proc.new {|project, title| url_for :controller => 'wiki', :action => 'index', :id => project, :page => title }
-    end
-    
-    project = options[:project] || @project
-    
-    # turn wiki links into html links
-    # example:
-    #   [[mypage]]
-    #   [[mypage|mytext]]
-    # wiki links can refer other project wikis, using project name or identifier:
-    #   [[project:]] -> wiki starting page
-    #   [[project:|mytext]]
-    #   [[project:mypage]]
-    #   [[project:mypage|mytext]]
-    text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) do |m|
-      link_project = project
-      page = $1
-      title = $3
-      if page =~ /^([^\:]+)\:(.*)$/
-        link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
-        page = title || $2
-        title = $1 if page.blank?
-      end
-      
-      if link_project && link_project.wiki
-        # check if page exists
-        wiki_page = link_project.wiki.find_page(page)
-        link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
-                                 :class => ('wiki-page' + (wiki_page ? '' : ' new')))
-      else
-        # project or wiki doesn't exist
-        title || page
-      end
-    end
-
-    # turn issue and revision ids into links
-    # example:
-    #   #52 -> <a href="/issues/show/52">#52</a>
-    #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (project.id is 6)
-    text = text.gsub(%r{([\s\(,-^])(#|r)(\d+)(?=[[:punct:]]|\s|<|$)}) do |m|
-      leading, otype, oid = $1, $2, $3
-      link = nil
-      if otype == 'r'
-        if project && (changeset = project.changesets.find_by_revision(oid))
-          link = link_to("r#{oid}", {:controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid}, :class => 'changeset',
-                                    :title => truncate(changeset.comments, 100))
-        end
-      else
-        if issue = Issue.find_by_id(oid.to_i, :include => [:project, :status], :conditions => Project.visible_by(User.current))        
-          link = link_to("##{oid}", {:controller => 'issues', :action => 'show', :id => oid}, :class => 'issue',
-                                    :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
-          link = content_tag('del', link) if issue.closed?
-        end
-      end
-      leading + (link || "#{otype}#{oid}")
-    end
-    
-    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 = {})
@@ -268,7 +104,6 @@ module ApplicationHelper
       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
@@ -280,14 +115,13 @@ module ApplicationHelper
         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] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
+          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"
@@ -299,7 +133,7 @@ module ApplicationHelper
   
   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.last <=> y.last }
+      (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 = {})
@@ -319,56 +153,10 @@ module ApplicationHelper
     link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")   
   end
   
-  def progress_bar(pcts, options={})
-    pcts = [pcts, pcts] unless pcts.is_a?(Array)
-    pcts[1] = pcts[1] - pcts[0]
-    pcts << (100 - pcts[1] - pcts[0])
-    width = options[:width] || '100px;'
-    legend = options[:legend] || ''
-    content_tag('table',
-      content_tag('tr',
-        (pcts[0] > 0 ? content_tag('td', '', :width => "#{pcts[0].floor}%;", :class => 'closed') : '') +
-        (pcts[1] > 0 ? content_tag('td', '', :width => "#{pcts[1].floor}%;", :class => 'done') : '') +
-        (pcts[2] > 0 ? content_tag('td', '', :width => "#{pcts[2].floor}%;", :class => 'todo') : '')
-      ), :class => 'progress', :style => "width: #{width};") +
-      content_tag('p', legend, :class => 'pourcent')
-  end
-  
-  def context_menu_link(name, url, options={})
-    options[:class] ||= ''
-    if options.delete(:selected)
-      options[:class] << ' icon-checked disabled'
-      options[:disabled] = true
-    end
-    if options.delete(:disabled)
-      options.delete(:method)
-      options.delete(:confirm)
-      options.delete(:onclick)
-      options[:class] << ' disabled'
-      url = '#'
-    end
-    link_to name, url, options
-  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
-  
-  def content_for(name, content = nil, &block)
-    @has_content ||= {}
-    @has_content[name] = true
-    super(name, content, &block)
-  end
-  
-  def has_content?(name)
-    (@has_content && @has_content[name]) || false
-  end
 end
 
 class TabularFormBuilder < ActionView::Helpers::FormBuilder
@@ -383,9 +171,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
     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) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
-      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))

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/custom_fields_helper.rb

@@ -24,6 +24,8 @@ module CustomFieldsHelper
     field_id = "custom_fields_#{custom_field.id}"
     
     case custom_field.field_format
+    when "string", "int"
+      text_field 'custom_value', 'value', :name => field_name, :id => field_id
     when "date"
       text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) + 
       calendar_for(field_id)
@@ -33,8 +35,6 @@ module CustomFieldsHelper
       check_box 'custom_value', 'value', :name => field_name, :id => field_id
     when "list"
       select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id
-    else
-      text_field 'custom_value', 'value', :name => field_name, :id => field_id
     end
   end
   

app/helpers/feeds_helper.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,5 +15,5 @@
 # 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
+module FeedsHelper
 end

app/helpers/help_helper.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,8 +15,5 @@
 # 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
+module HelpHelper
-  belongs_to :changeset
-  
-  validates_presence_of :changeset_id, :action, :path
 end

app/helpers/ifpdf_helper.rb

@@ -16,57 +16,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require 'iconv'
-require 'rfpdf/chinese'
 
 module IfpdfHelper
 
   class IFPDF < FPDF
-    include GLoc
+
     attr_accessor :footer_date
     
-    def initialize(lang)
+    def initialize
-      super()
+      super
-      set_language_if_valid lang
-      case current_language
-      when :ja
-        extend(PDF_Japanese)
-        AddSJISFont()
-        @font_for_content = 'SJIS'
-        @font_for_footer = 'SJIS'
-      when :zh
-        extend(PDF_Chinese)
-        AddBig5Font()
-        @font_for_content = 'Big5'
-        @font_for_footer = 'Big5'
-      else
-        @font_for_content = 'Arial'
-        @font_for_footer = 'Helvetica'              
-      end
       SetCreator("redMine #{Redmine::VERSION}")
-      SetFont(@font_for_content)
-    end
-    
-    def SetFontStyle(style, size)
-      SetFont(@font_for_content, style, size)
     end
       
     def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
-      @ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
+      @ic ||= Iconv.new('ISO-8859-1', 'UTF-8')
-      # these quotation marks are not correctly rendered in the pdf
-      txt = txt.gsub(/[“”]/, '"') if txt
       txt = begin
-        # 0x5c char handling
+        @ic.iconv(txt)
-        txtar = txt.split('\\')
-        txtar << '' if txt[-1] == ?\\
-        txtar.collect {|x| @ic.iconv(x)}.join('\\').gsub(/\\/, "\\\\\\\\")
       rescue
         txt
-      end || ''
+      end
       super w,h,txt,border,ln,align,fill,link
     end
     
     def Footer
-      SetFont(@font_for_footer, 'I', 8)
+      SetFont('Helvetica', 'I', 8)
       SetY(-15)
       SetX(15)
       Cell(0, 5, @footer_date, 0, 0, 'L')

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/issues_helper.rb

@@ -15,23 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'csv'
-
 module IssuesHelper
-  include ApplicationHelper
-
-  def render_issue_tooltip(issue)
-    @cached_label_start_date ||= l(:field_start_date)
-    @cached_label_due_date ||= l(:field_due_date)
-    @cached_label_assigned_to ||= l(:field_assigned_to)
-    @cached_label_priority ||= l(:field_priority)
-    
-    link_to_issue(issue) + ": #{h(issue.subject)}<br /><br />" +
-      "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />" +
-      "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />" +
-      "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
-      "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
-  end
 
   def show_detail(detail, no_html=false)
     case detail.property
@@ -64,8 +48,6 @@ module IssuesHelper
         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
       end
-    when 'attachment'
-      label = l(:label_attachment)
     end
        
     label ||= detail.prop_key
@@ -76,84 +58,17 @@ module IssuesHelper
       label = content_tag('strong', label)
       old_value = content_tag("i", h(old_value)) if detail.old_value
       old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
-      if detail.property == 'attachment' && !value.blank? && Attachment.find_by_id(detail.prop_key)
+      value = content_tag("i", h(value)) if value
-        # Link to the attachment if it has not been removed
-        value = link_to(value, :controller => 'attachments', :action => 'download', :id => detail.prop_key)
-      else
-        value = content_tag("i", h(value)) if value
-      end
     end
     
-    if !detail.value.blank?
+    if detail.value and !detail.value.to_s.empty?
-      case detail.property
+      if old_value
-      when 'attr', 'cf'
+        label + " " + l(:text_journal_changed, old_value, value)
-        if !detail.old_value.blank?
+      else
-          label + " " + l(:text_journal_changed, old_value, value)
+        label + " " + l(:text_journal_set_to, value)
-        else
-          label + " " + l(:text_journal_set_to, value)
-        end
-      when 'attachment'
-        "#{label} #{value} #{l(:label_added)}"
       end
     else
-      case detail.property
+      label + " " + l(:text_journal_deleted) + " (#{old_value})"
-      when 'attr', 'cf'
-        label + " " + l(:text_journal_deleted) + " (#{old_value})"
-      when 'attachment'
-        "#{label} #{old_value} #{l(:label_deleted)}"
-      end
     end
   end
-  
-  def issues_to_csv(issues, project = nil)
-    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_status), 
-                  l(:field_project),
-                  l(:field_tracker),
-                  l(:field_priority),
-                  l(:field_subject),
-                  l(:field_assigned_to),
-                  l(:field_category),
-                  l(:field_fixed_version),
-                  l(:field_author),
-                  l(:field_start_date),
-                  l(:field_due_date),
-                  l(:field_done_ratio),
-                  l(:field_created_on),
-                  l(:field_updated_on)
-                  ]
-      # Export project custom fields if project is given
-      # otherwise export custom fields marked as "For all projects"
-      custom_fields = project.nil? ? IssueCustomField.for_all : project.all_custom_fields
-      custom_fields.each {|f| headers << f.name}
-      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
-      # csv lines
-      issues.each do |issue|
-        fields = [issue.id,
-                  issue.status.name, 
-                  issue.project.name,
-                  issue.tracker.name, 
-                  issue.priority.name,
-                  issue.subject,
-                  issue.assigned_to,
-                  issue.category,
-                  issue.fixed_version,
-                  issue.author.name,
-                  format_date(issue.start_date),
-                  format_date(issue.due_date),
-                  issue.done_ratio,
-                  format_time(issue.created_on),  
-                  format_time(issue.updated_on)
-                  ]
-        custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
-        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
-      end
-    end
-    export.rewind
-    export
-  end
 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/projects_helper.rb

@@ -16,184 +16,4 @@
 # 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
-  
-  def project_settings_tabs
-    tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
-            {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
-            {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
-            {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
-            {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
-            {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
-            {:name => 'repository', :action => :manage_repository, :partial => 'projects/settings/repository', :label => :label_repository},
-            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}
-            ]
-    tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}     
-  end
-  
-  # Generates a gantt image
-  # Only defined if RMagick is avalaible
-  def gantt_image(events, date_from, months, zoom)
-    date_to = (date_from >> months)-1    
-    show_weeks = zoom > 1
-    show_days = zoom > 2
-    
-    subject_width = 320
-    header_heigth = 18
-    # width of one day in pixels
-    zoom = zoom*2
-    g_width = (date_to - date_from + 1)*zoom
-    g_height = 20 * events.length + 20
-    headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
-    height = g_height + headers_heigth
-        
-    imgl = Magick::ImageList.new
-    imgl.new_image(subject_width+g_width+1, height)
-    gc = Magick::Draw.new
-    
-    # Subjects
-    top = headers_heigth + 20
-    gc.fill('black')
-    gc.stroke('transparent')
-    gc.stroke_width(1)
-    events.each do |i|
-      gc.text(4, top + 2, (i.is_a?(Issue) ? i.subject : i.name))
-      top = top + 20
-    end
-
-    # Months headers
-    month_f = date_from
-    left = subject_width
-    months.times do 
-      width = ((month_f >> 1) - month_f) * zoom
-      gc.fill('white')
-      gc.stroke('grey')
-      gc.stroke_width(1)
-      gc.rectangle(left, 0, left + width, height)
-      gc.fill('black')
-      gc.stroke('transparent')
-      gc.stroke_width(1)
-      gc.text(left.round + 8, 14, "#{month_f.year}-#{month_f.month}")
-      left = left + width
-      month_f = month_f >> 1
-    end
-    
-    # Weeks headers
-    if show_weeks
-    	left = subject_width
-    	height = header_heigth
-    	if date_from.cwday == 1
-    	    # date_from is monday
-            week_f = date_from
-    	else
-    	    # find next monday after date_from
-    		week_f = date_from + (7 - date_from.cwday + 1)
-    		width = (7 - date_from.cwday + 1) * zoom
-            gc.fill('white')
-            gc.stroke('grey')
-            gc.stroke_width(1)
-            gc.rectangle(left, header_heigth, left + width, 2*header_heigth + g_height-1)
-    		left = left + width
-    	end
-    	while week_f <= date_to
-    		width = (week_f + 6 <= date_to) ? 7 * zoom : (date_to - week_f + 1) * zoom
-            gc.fill('white')
-            gc.stroke('grey')
-            gc.stroke_width(1)
-            gc.rectangle(left.round, header_heigth, left.round + width, 2*header_heigth + g_height-1)
-            gc.fill('black')
-            gc.stroke('transparent')
-            gc.stroke_width(1)
-            gc.text(left.round + 2, header_heigth + 14, week_f.cweek.to_s)
-    		left = left + width
-    		week_f = week_f+7
-    	end
-    end
-    
-    # Days details (week-end in grey)
-    if show_days
-    	left = subject_width
-    	height = g_height + header_heigth - 1
-    	wday = date_from.cwday
-    	(date_to - date_from + 1).to_i.times do 
-          width =  zoom
-          gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
-          gc.stroke('grey')
-          gc.stroke_width(1)
-          gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
-          left = left + width
-          wday = wday + 1
-          wday = 1 if wday > 7
-    	end
-    end
-
-    # border
-    gc.fill('transparent')
-    gc.stroke('grey')
-    gc.stroke_width(1)
-    gc.rectangle(0, 0, subject_width+g_width, headers_heigth)
-    gc.stroke('black')
-    gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_heigth-1)
-        
-    # content
-    top = headers_heigth + 20
-    gc.stroke('transparent')
-    events.each do |i|      
-      if i.is_a?(Issue)       
-        i_start_date = (i.start_date >= date_from ? i.start_date : date_from )
-        i_end_date = (i.due_date <= date_to ? i.due_date : date_to )        
-        i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
-        i_done_date = (i_done_date <= date_from ? date_from : i_done_date )
-        i_done_date = (i_done_date >= date_to ? date_to : i_done_date )        
-        i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
-        
-        i_left = subject_width + ((i_start_date - date_from)*zoom).floor 	
-        i_width = ((i_end_date - i_start_date + 1)*zoom).floor                  # total width of the issue
-        d_width = ((i_done_date - i_start_date)*zoom).floor                     # done width
-        l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor : 0 # delay width
-  
-        gc.fill('grey')
-        gc.rectangle(i_left, top, i_left + i_width, top - 6)
-        gc.fill('red')
-        gc.rectangle(i_left, top, i_left + l_width, top - 6) if l_width > 0
-        gc.fill('blue')
-        gc.rectangle(i_left, top, i_left + d_width, top - 6) if d_width > 0
-        gc.fill('black')
-        gc.text(i_left + i_width + 5,top + 1, "#{i.status.name} #{i.done_ratio}%")
-      else
-        i_left = subject_width + ((i.start_date - date_from)*zoom).floor
-        gc.fill('green')
-        gc.rectangle(i_left, top, i_left + 6, top - 6)        
-        gc.fill('black')
-        gc.text(i_left + 11, top + 1, i.name)
-      end
-      top = top + 20
-    end
-    
-    # today red line
-    if Date.today >= @date_from and Date.today <= @date_to
-      gc.stroke('red')
-      x = (Date.today-@date_from+1)*zoom + subject_width
-      gc.line(x, headers_heigth, x, headers_heigth + g_height-1)      
-    end    
-    
-    gc.draw(imgl)
-    imgl
-  end if Object.const_defined?(:Magick)
-  
-  def new_issue_selector
-    trackers = @project.trackers
-    # can't use form tag inside helper
-    content_tag('form',
-      select_tag('tracker_id', '<option></option>' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
-      :action => url_for(:controller => 'projects', :action => 'add_issue', :id => @project), :method => 'get')
-  end
 end

app/helpers/queries_helper.rb

@@ -1,51 +1,6 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
 module QueriesHelper
 
   def operators_for_select(filter_type)
     Query.operators_by_filter_type[filter_type].collect {|o| [l(Query.operators[o]), o]}
   end
-  
-  def column_header(column)
-    column.sortable ? sort_header_tag(column.sortable, :caption => column.caption) : content_tag('th', column.caption)
-  end
-  
-  def column_content(column, issue)
-    if column.is_a?(QueryCustomFieldColumn)
-      cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
-      show_value(cv)
-    else
-      value = issue.send(column.name)
-      if value.is_a?(Date)
-        format_date(value)
-      elsif value.is_a?(Time)
-        format_time(value)
-      else
-        case column.name
-        when :subject
-        h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
-          link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
-        when :done_ratio
-          progress_bar(value, :width => '80px')
-        else
-          h(value)
-        end
-      end
-    end
-  end
 end

app/helpers/reports_helper.rb

@@ -22,15 +22,11 @@ module ReportsHelper
     data.each { |row|
       match = 1
       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?
       a = a + row["total"].to_i if match == 1
     } unless data.nil?
     a
   end
   
-  def aggregate_link(data, criteria, *args)
-    a = aggregate data, criteria
-    a > 0 ? link_to(a, *args) : '-'
-  end  
 end

app/helpers/repositories_helper.rb

@@ -15,73 +15,5 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'coderay'
-require 'coderay/helpers/file_type'
-require 'iconv'
-
 module RepositoriesHelper
-  def syntax_highlight(name, content)
-    type = CodeRay::FileType[name]
-    type ? CodeRay.scan(content, type).html : h(content)
-  end
-  
-  def to_utf8(str)
-    return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
-    @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
-    @encodings.each do |encoding|
-      begin
-        return Iconv.conv('UTF-8', encoding, str)
-      rescue Iconv::Failure
-        # do nothing here and try the next encoding
-      end
-    end
-    str
-  end
-  
-  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(repository)
-    container = [[]]
-    REDMINE_SUPPORTED_SCM.each {|scm| container << ["Repository::#{scm}".constantize.scm_name, scm]}
-    select_tag('repository_scm', 
-               options_for_select(container, repository.class.name.demodulize),
-               :disabled => (repository && !repository.new_record?),
-               :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :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, :name => 'ignore',
-                                           :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
-                                           :onfocus => "this.value=''; this.name='repository[password]';",
-                                           :onchange => "this.name='repository[password]';"))
-  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
-
-  def bazaar_field_tags(form, repository)
-      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
-  end
 end

app/helpers/search_helper.rb

@@ -1,38 +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 text && tokens && !tokens.empty?
-    regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE    
-    result = ''
-    text.split(regexp).each_with_index do |words, i|
-      if result.length > 1200
-        # maximum length of the preview reached
-        result << '...'
-        break
-      end
-      if i.even?
-        result << h(words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words)
-      else
-        t = (tokens.index(words.downcase) || 0) % 4
-        result << content_tag('span', h(words), :class => "highlight token-#{t}")
-      end
-    end
-    result
-  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
 
@@ -137,8 +135,13 @@ module SortHelper
   #   </th>
   #
   def sort_header_tag(column, options = {})
-    caption = options.delete(:caption) || titleize(Inflector::humanize(column))
+    if options[:caption]
-    options[:title]= l(:label_sort_by, "\"#{caption}\"") unless options[:title]
+      caption = options[:caption]
+      options.delete(:caption)
+    else
+      caption = titleize(Inflector::humanize(column))
+    end
+    options[:title]= "Sort by #{caption}" unless options[:title]
     content_tag('th', sort_link(column, caption), options)
   end
 

app/helpers/users_helper.rb

@@ -16,10 +16,4 @@
 # 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

@@ -16,32 +16,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module VersionsHelper
-
-  STATUS_BY_CRITERIAS = %w(category tracker priority author assigned_to)
-  
-  def render_issue_status_by(version, criteria)
-    criteria ||= 'category'
-    raise 'Unknown criteria' unless STATUS_BY_CRITERIAS.include?(criteria)
-    
-    h = Hash.new {|k,v| k[v] = [0, 0]}
-    begin
-      # Total issue count
-      Issue.count(:group => criteria,
-                  :conditions => ["#{Issue.table_name}.fixed_version_id = ?", version.id]).each {|c,s| h[c][0] = s}
-      # Open issues count
-      Issue.count(:group => criteria,
-                  :include => :status,
-                  :conditions => ["#{Issue.table_name}.fixed_version_id = ? AND #{IssueStatus.table_name}.is_closed = ?", version.id, false]).each {|c,s| h[c][1] = s}
-    rescue ActiveRecord::RecordNotFound
-    # When grouping by an association, Rails throws this exception if there's no result (bug)
-    end
-    counts = h.keys.compact.sort.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
-    max = counts.collect {|c| c[:total]}.max
-    
-    render :partial => 'issue_counts', :locals => {:version => version, :criteria => criteria, :counts => counts, :max => max}
-  end
-  
-  def status_by_options_for_select(value)
-    options_for_select(STATUS_BY_CRITERIAS.collect {|criteria| [l("field_#{criteria}".to_sym), criteria]}, value)
-  end
 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 && user.logged? && 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/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

@@ -21,13 +21,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :container, :polymorphic => true
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   
-  validates_presence_of :container, :filename, :author
+  validates_presence_of :container, :filename
-  validates_length_of :filename, :maximum => 255
-  validates_length_of :disk_filename, :maximum => 255
-
-  acts_as_event :title => :filename,
-                :description => :filename,
-                :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id}}
   
   cattr_accessor :storage_path
   @@storage_path = "#{RAILS_ROOT}/files"
@@ -42,7 +36,7 @@ class Attachment < ActiveRecord::Base
 			if @temp_file.size > 0
 				self.filename = sanitize_filename(@temp_file.original_filename)
 				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
-				self.content_type = @temp_file.content_type.chomp
+				self.content_type = @temp_file.content_type
 				self.filesize = @temp_file.size
 			end
 		end
@@ -61,10 +55,6 @@ class Attachment < ActiveRecord::Base
 			end
 			self.digest = Digest::MD5.hexdigest(File.read(diskfile))
 		end
-		# Don't save the content type if it's longer than the authorized length
-		if self.content_type && self.content_type.length > 255
-		  self.content_type = nil
-		end
 	end
 	
 	# Deletes file on the disk
@@ -83,13 +73,10 @@ class Attachment < ActiveRecord::Base
     increment!(:downloads)
   end
 	
-  def project
+	# returns last created projects
-    container.project
+	def self.most_downloaded
-  end
+		find(:all, :limit => 5, :order => "downloads DESC")	
-  
+	end
-  def image?
-    self.filename =~ /\.(jpeg|jpg|gif|png)$/i
-  end
 	
 private
   def sanitize_filename(value)

app/models/auth_source.rb

@@ -20,9 +20,6 @@ class AuthSource < ActiveRecord::Base
   
   validates_presence_of :name
   validates_uniqueness_of :name
-  validates_length_of :name, :host, :account_password, :maximum => 60
-  validates_length_of :account, :base_dn, :maximum => 255
-  validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30
 
   def authenticate(login, password)
   end

app/models/auth_source_ldap.rb

@@ -20,7 +20,6 @@ require 'iconv'
 
 class AuthSourceLdap < AuthSource 
   validates_presence_of :host, :port, :attr_login
-  validates_presence_of :attr_firstname, :attr_lastname, :attr_mail, :if => Proc.new { |a| a.onthefly_register? }
 
   def after_initialize
     self.port = 389 if self.port == 0
@@ -35,13 +34,12 @@ class AuthSourceLdap < AuthSource
     dn = String.new
     ldap_con.search( :base => self.base_dn, 
                      :filter => object_filter & login_filter, 
-                     # only ask for the DN if on-the-fly registration is disabled
+                     :attributes=> ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]) do |entry|
-                     :attributes=> (onthefly_register? ? ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail] : ['dn'])) do |entry|
       dn = entry.dn
       attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
                :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
                :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
-               :auth_source_id => self.id ] if onthefly_register?
+               :auth_source_id => self.id ]
     end
     return nil if dn.empty?
     logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
@@ -71,8 +69,7 @@ private
   def initialize_ldap_con(ldap_user, ldap_password)
     Net::LDAP.new( {:host => self.host, 
                     :port => self.port, 
-                    :auth => { :method => :simple, :username => ldap_user, :password => 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) }} 
-                    :encryption => (self.tls ? :simple_tls : nil)} 
     ) 
   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/changeset.rb

@@ -1,104 +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
-
-  acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
-                :description => :comments,
-                :datetime => :committed_on,
-                :author => :committer,
-                :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
-                
-  acts_as_searchable :columns => 'comments',
-                     :include => :repository,
-                     :project_key => "#{Repository.table_name}.project_id",
-                     :date_column => 'committed_on'
-  
-  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 comments=(comment)
-    write_attribute(:comments, comment.strip)
-  end
-
-  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(",").collect(&:strip)
-    # keywords used to fix issues
-    fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
-    # status and optional done ratio applied
-    fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
-    done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
-    
-    kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
-    return if kw_regexp.blank?
-    
-    referenced_issues = []
-    
-    if ref_keywords.delete('*')
-      # find any issue ID in the comments
-      target_issue_ids = []
-      comments.scan(%r{([\s\(,-^])#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
-      referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
-    end
-    
-    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.done_ratio = done_ratio if done_ratio
-          issue.save
-        end
-      end
-      referenced_issues += target_issues
-    end
-    
-    self.issues = referenced_issues.uniq
-  end
-
-  # Returns the previous changeset
-  def previous
-    @previous ||= Changeset.find(:first, :conditions => ['revision < ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision DESC')
-  end
-
-  # Returns the next changeset
-  def next
-    @next ||= Changeset.find(:first, :conditions => ['revision > ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision ASC')
-  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

@@ -17,21 +17,18 @@
 
 class CustomField < ActiveRecord::Base
   has_many :custom_values, :dependent => :delete_all
-  acts_as_list :scope => 'type = \'#{self.class}\''
   serialize :possible_values
   
   FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
                     "text" => { :name => :label_text, :order => 2 },
                     "int" => { :name => :label_integer, :order => 3 },
-                    "float" => { :name => :label_float, :order => 4 },
+                    "list" => { :name => :label_list, :order => 4 },
-                    "list" => { :name => :label_list, :order => 5 },
+			        "date" => { :name => :label_date, :order => 5 },
-			        "date" => { :name => :label_date, :order => 6 },
+			        "bool" => { :name => :label_boolean, :order => 6 }
-			        "bool" => { :name => :label_boolean, :order => 7 }
   }.freeze
 
   validates_presence_of :name, :field_format
   validates_uniqueness_of :name
-  validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
   validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
 
@@ -52,10 +49,6 @@ class CustomField < ActiveRecord::Base
     end
   end
 
-  def <=>(field)
-    position <=> field.position
-  end
-  
   # to move in project_custom_field
   def self.for_all
     find(:all, :conditions => ["is_for_all=?", true])

app/models/custom_value.rb

@@ -21,19 +21,18 @@ class CustomValue < ActiveRecord::Base
 
 protected
   def validate
-    errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.blank?    
+    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_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
     case custom_field.field_format
-    when 'int'
+    when "int"
-      errors.add(:value, :activerecord_error_not_a_number) unless value.blank? || value =~ /^[+-]?\d+$/	
+      errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[0-9]*$/	
-    when 'float'
+    when "date"
-      begin; !value.blank? && Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
+      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty?
-    when 'date'
+    when "list"
-      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.blank?
+      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty?
-    when 'list'
-      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value) or value.blank?
     end
   end
 end
+

app/models/document.rb

@@ -20,11 +20,5 @@ class Document < ActiveRecord::Base
   belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
   has_many :attachments, :as => :container, :dependent => :destroy
 
-  acts_as_searchable :columns => ['title', 'description']
-  acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
-                :author => Proc.new {|o| (a = o.attachments.find(:first, :order => "#{Attachment.table_name}.created_on ASC")) ? a.author : nil },
-                :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
-
   validates_presence_of :project, :title, :category
-  validates_length_of :title, :maximum => 60
 end

app/models/enabled_module.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.
-
-class EnabledModule < ActiveRecord::Base
-  belongs_to :project
-  
-  validates_presence_of :name
-  validates_uniqueness_of :name, :scope => :project_id
-end

app/models/enumeration.rb

@@ -16,43 +16,25 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Enumeration < ActiveRecord::Base
-  acts_as_list :scope => 'opt = \'#{opt}\''
-
   before_destroy :check_integrity
   
   validates_presence_of :opt, :name
   validates_uniqueness_of :name, :scope => [:opt]
-  validates_length_of :name, :maximum => 30
   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}, :order => 'position')
+		find(:all, :conditions => ['opt=?', option])
-  end
+	end
-  
-  def self.default(option)  
-    find(:first, :conditions => {:opt => option, :is_default => true}, :order => 'position')
-  end
 	
   def option_name
     OPTIONS[self.opt]
   end
   
-  def before_save
-    Enumeration.update_all("is_default = #{connection.quoted_false}", {:opt => opt}) if is_default?
-  end
-  
-  def <=>(enumeration)
-    position <=> enumeration.position
-  end
-  
-  def to_s; name end
-  
 private
   def check_integrity
     case self.opt
@@ -60,8 +42,6 @@ private
       raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
     when "DCAT"
       raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
-    when "ACTI"
-      raise "Can't delete enumeration" if TimeEntry.find(:first, :conditions => ["activity_id=?", self.id])
     end
   end
 end

app/models/issue.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,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Issue < ActiveRecord::Base
+
   belongs_to :project
   belongs_to :tracker
   belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
@@ -27,69 +28,17 @@ class Issue < ActiveRecord::Base
 
   has_many :journals, :as => :journalized, :dependent => :destroy
   has_many :attachments, :as => :container, :dependent => :destroy
-  has_many :time_entries, :dependent => :nullify
+
   has_many :custom_values, :dependent => :delete_all, :as => :customized
   has_many :custom_fields, :through => :custom_values
-  has_and_belongs_to_many :changesets, :order => "revision ASC"
 
-  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
-  
-  acts_as_watchable
-  acts_as_searchable :columns => ['subject', 'description'], :with => {:journal => :issue}
-  acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
-                :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}                
-  
-  validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status
-  validates_length_of :subject, :maximum => 255
   validates_inclusion_of :done_ratio, :in => 0..100
-  validates_numericality_of :estimated_hours, :allow_nil => true
   validates_associated :custom_values, :on => :update
 
-  def after_initialize
+  # set default status for new issues
-    if new_record?
+  def before_validation
-      # set default values for new records only
+    self.status = IssueStatus.default if new_record?
-      self.status ||= IssueStatus.default
-      self.priority ||= Enumeration.default('IPRI')
-    end
-  end
-  
-  def copy_from(arg)
-    issue = arg.is_a?(Issue) ? arg : Issue.find(arg)
-    self.attributes = issue.attributes.dup
-    self.custom_values = issue.custom_values.collect {|v| v.clone}
-    self
-  end
-  
-  # Move an issue to a new project and tracker
-  def move_to(new_project, new_tracker = nil)
-    transaction do
-      if new_project && project_id != new_project.id
-        # delete issue relations
-        self.relations_from.clear
-        self.relations_to.clear
-        # issue is moved to another project
-        self.category = nil 
-        self.fixed_version = nil
-        self.project = new_project
-      end
-      if new_tracker
-        self.tracker = new_tracker
-      end
-      if save
-        # Manually update project_id on related time entries
-        TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})
-      else
-        rollback_db_transaction
-        return false
-      end
-    end
-    return true
-  end
-  
-  def priority_id=(pid)
-    self.priority = nil
-    write_attribute(:priority_id, pid)
   end
 
   def validate
@@ -100,22 +49,11 @@ class Issue < ActiveRecord::Base
     if self.due_date and self.start_date and self.due_date < self.start_date
       errors.add :due_date, :activerecord_error_greater_than_start_date
     end
-    
-    if start_date && soonest_start && start_date < soonest_start
-      errors.add :start_date, :activerecord_error_invalid
-    end
   end
 
-  def validate_on_create
+  #def before_create
-    errors.add :tracker_id, :activerecord_error_invalid unless project.trackers.include?(tracker)
+  #  build_history
-  end
+  #end
-  
-  def before_create
-    # default assignment based on category
-    if assigned_to.nil? && category && category.assigned_to
-      self.assigned_to = category.assigned_to
-    end
-  end
   
   def before_save
     if @current_journal
@@ -128,33 +66,17 @@ class Issue < ActiveRecord::Base
       }
       # custom fields changes
       custom_values.each {|c|
-        next if (@custom_values_before_change[c.custom_field_id]==c.value ||
-                  (@custom_values_before_change[c.custom_field_id].blank? && c.value.blank?))
         @current_journal.details << JournalDetail.new(:property => 'cf', 
                                                       :prop_key => c.custom_field_id,
                                                       :old_value => @custom_values_before_change[c.custom_field_id],
-                                                      :value => c.value)
+                                                      :value => c.value) unless @custom_values_before_change[c.custom_field_id]==c.value
       }      
-      @current_journal.save
+      @current_journal.save unless @current_journal.details.empty? and @current_journal.notes.empty?
     end
-    # Save the issue even if the journal is not saved (because empty)
-    true
   end
   
-  def after_save
+  def long_id
-    # Update start/due dates of following issues
+    "%05d" % self.id
-    relations_from.each(&:set_issue_to_dates)
-    
-    # Close duplicates if the issue was closed
-    if @issue_before_change && !@issue_before_change.closed? && self.closed?
-      duplicates.each do |duplicate|
-        # Don't re-close it if it's already closed
-        next if duplicate.closed?
-        # Same user and notes
-        duplicate.init_journal(@current_journal.user, @current_journal.notes)
-        duplicate.update_attribute :status, self.status
-      end
-    end
   end
   
   def custom_value_for(custom_field)
@@ -170,52 +92,11 @@ class Issue < ActiveRecord::Base
     @current_journal
   end
 
-  # Return true if the issue is closed, otherwise false
+private
-  def closed?
+  # Creates an history for the issue
-    self.status.is_closed?
+  #def build_history
-  end
+  #  @history = self.histories.build
-  
+  #  @history.status = self.status
-  # Users the issue can be assigned to
+  #  @history.author = self.author
-  def assignable_users
+  #end
-    project.assignable_users
-  end
-  
-  # Returns the mail adresses of users that should be notified for the issue
-  def recipients
-    recipients = project.recipients
-    # Author and assignee are always notified
-    recipients << author.mail if author
-    recipients << assigned_to.mail if assigned_to
-    recipients.compact.uniq
-  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
-  
-  # Returns an array of the duplicate issues
-  def duplicates
-    relations.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.other_issue(self)}
-  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

@@ -16,28 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueCategory < ActiveRecord::Base
+  before_destroy :check_integrity  
   belongs_to :project
-  belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
-  has_many :issues, :foreign_key => 'category_id', :dependent => :nullify
 
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]
-  validates_length_of :name, :maximum => 30
   
-  alias :destroy_without_reassign :destroy
+private
-  
+  def check_integrity
-  # Destroy the category
+    raise "Can't delete category" if Issue.find(:first, :conditions => ["category_id=?", self.id])
-  # If a category is specified, issues are reassigned to this category
-  def destroy(reassign_to = nil)
-    if reassign_to && reassign_to.is_a?(IssueCategory) && reassign_to.project == self.project
-      Issue.update_all("category_id = #{reassign_to.id}", "category_id = #{id}")
-    end
-    destroy_without_reassign
   end
-  
-  def <=>(category)
-    name <=> category.name
-  end
-  
-  def to_s; name end
 end

app/models/issue_custom_field.rb

@@ -16,8 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 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
     
   def type_name

app/models/issue_history.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,11 +15,10 @@
 # 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
+class IssueHistory < ActiveRecord::Base
-  api_method :projects,
+	belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
-             :expects => [],
+	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-             :returns => [[Project]]
+	belongs_to :issue
-  api_method :repository_created,
+	
-             :expects => [:string, :string],
+	validates_presence_of :status
-             :returns => [:int]
 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 || Setting.cross_project_issue_relations?
-      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

@@ -17,13 +17,14 @@
 
 class IssueStatus < ActiveRecord::Base
   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
 
   validates_presence_of :name
   validates_uniqueness_of :name
-  validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+  validates_length_of :html_color, :is => 6
+  validates_format_of :html_color, :with => /^[a-f0-9]*$/i
 
   def before_save
     IssueStatus.update_all "is_default=#{connection.quoted_false}" if self.is_default?
@@ -35,29 +36,14 @@ class IssueStatus < ActiveRecord::Base
   end
 
   # 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)
-    new_statuses = workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker
+    statuses = []
-    new_statuses ? new_statuses.compact.sort{|x, y| x.position <=> y.position } : []
+    for workflow in self.workflows
+      statuses << workflow.new_status if workflow.role_id == role.id and workflow.tracker_id == tracker.id
+    end unless role.nil? or tracker.nil?
+    statuses
   end
   
-  # Same thing as above but uses a database query
-  # More efficient than the previous method if called just once
-  def find_new_statuses_allowed_to(role, tracker)  
-    new_statuses = workflows.find(:all, 
-                                   :include => :new_status,
-                                   :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
-  
-  def new_status_allowed_to?(status, role, tracker)
-    status && role && tracker ?
-      !workflows.find(:first, :conditions => {:new_status_id => status.id, :role_id => role.id, :tracker_id => tracker.id}).nil? :
-      false
-  end
-
-  def to_s; name end
-
 private
   def check_integrity
     raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id])

app/models/journal.rb

@@ -17,31 +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
-  
-  acts_as_searchable :columns => 'notes',
-                     :include => :issue,
-                     :project_key => "#{Issue.table_name}.project_id",
-                     :date_column => "#{Issue.table_name}.created_on"
-  
-  acts_as_event :title => Proc.new {|o| "#{o.issue.tracker.name} ##{o.issue.id}: #{o.issue.subject}" + ((s = o.new_status) ? " (#{s})" : '') },
-                :description => :notes,
-                :author => :user,
-                :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id}}
-
-  def save
-    # Do not save an empty journal
-    (details.empty? && notes.blank?) ? false : super
-  end
-  
-  # Returns the new status if the journal contains a status change, otherwise nil
-  def new_status
-    c = details.detect {|detail| detail.prop_key == 'status_id'}
-    (c && c.value) ? IssueStatus.find_by_id(c.value.to_i) : nil
-  end
 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 user.allowed_to?(:add_issue_notes, issue.project)
-    
-    # add the note
-    issue.init_journal(user, email.body.chomp)
-    issue.save
-  end
-end

app/models/mailer.rb

@@ -16,145 +16,73 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Mailer < ActionMailer::Base
-  helper ApplicationHelper
   helper IssuesHelper
-  helper CustomFieldsHelper
-  
-  include ActionController::UrlWriter
 
   def issue_add(issue)
-    recipients issue.recipients    
+    set_language_if_valid(Setting.default_language)
-    subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
+    # Sends to all project members
-    body :issue => issue,
+    @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }.compact
-         :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
+    @from           = Setting.mail_from
+    @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
+    @body['issue']  = issue
   end
 
   def issue_edit(journal)
+    set_language_if_valid(Setting.default_language)
+    # Sends to all project members
     issue = journal.journalized
-    recipients issue.recipients
+    @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }.compact
-    # Watchers in cc
+    @from           = Setting.mail_from
-    cc(issue.watcher_recipients - @recipients)
+    @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
-    subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
+    @body['issue']  = issue
-    body :issue => issue,
+    @body['journal']= journal
-         :journal => journal,
-         :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
   end
   
-  def document_added(document)
+  def document_add(document)
-    recipients document.project.recipients
+    set_language_if_valid(Setting.default_language)
-    subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
+    @recipients     = document.project.users.collect { |u| u.mail if u.mail_notification }.compact
-    body :document => document,
+    @from           = Setting.mail_from
-         :document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
+    @subject        = "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
+    @body['document'] = document
   end
   
-  def attachments_added(attachments)
+  def attachments_add(attachments)
+    set_language_if_valid(Setting.default_language)
     container = attachments.first.container
-    added_to = ''
+    url = "http://#{Setting.host_name}/"
-    added_to_url = ''
+    added_to = ""
-    case container.class.name
+    case container.class.to_s
     when 'Version'
-      added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
+      url << "projects/list_files/#{container.project_id}"
       added_to = "#{l(:label_version)}: #{container.name}"
     when 'Document'
-      added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
+      url << "documents/show/#{container.id}"
       added_to = "#{l(:label_document)}: #{container.title}"
+    when 'Issue'
+      url << "issues/show/#{container.id}"
+      added_to = "#{container.tracker.name} ##{container.id}: #{container.subject}"
     end
-    recipients container.project.recipients
+    @recipients     = container.project.users.collect { |u| u.mail if u.mail_notification }.compact
-    subject "[#{container.project.name}] #{l(:label_attachment_new)}"
+    @from           = Setting.mail_from
-    body :attachments => attachments,
+    @subject        = "[#{container.project.name}] #{l(:label_attachment_new)}"
-         :added_to => added_to,
+    @body['attachments'] = attachments
-         :added_to_url => added_to_url
+    @body['url']    = url
-  end
+    @body['added_to'] = added_to
-
-  def news_added(news)
-    recipients news.project.recipients
-    subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
-    body :news => news,
-         :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
-  end
-
-  def message_posted(message, recipients)
-    recipients(recipients)
-    subject "[#{message.board.project.name} - #{message.board.name}] #{message.subject}"
-    body :message => message,
-         :message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
-  end
-   
-  def account_information(user, password)
-    set_language_if_valid user.language
-    recipients user.mail
-    subject l(:mail_subject_register)
-    body :user => user,
-         :password => password,
-         :login_url => url_for(:controller => 'account', :action => 'login')
-  end
-  
-  def account_activation_request(user)
-    # Send the email to all active administrators
-    recipients User.find_active(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
-    subject l(:mail_subject_account_activation_request)
-    body :user => user,
-         :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
   end
   
   def lost_password(token)
     set_language_if_valid(token.user.language)
-    recipients token.user.mail
+    @recipients     = token.user.mail
-    subject l(:mail_subject_lost_password)
+    @from           = Setting.mail_from
-    body :token => token,
+    @subject        = l(:mail_subject_lost_password)
-         :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
+    @body['token']  = token
   end  
 
   def register(token)
     set_language_if_valid(token.user.language)
-    recipients token.user.mail
+    @recipients     = token.user.mail
-    subject l(:mail_subject_register)
+    @from           = Setting.mail_from
-    body :token => token,
+    @subject        = l(:mail_subject_register)
-         :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
+    @body['token']  = token
   end
-  
-  def test(user)
-    set_language_if_valid(user.language)
-    recipients user.mail
-    subject 'Redmine test'
-    body :url => url_for(:controller => 'welcome')
-  end
-  
-  private
-  def initialize_defaults(method_name)
-    super
-    set_language_if_valid Setting.default_language
-    from Setting.mail_from
-    default_url_options[:host] = Setting.host_name
-    default_url_options[:protocol] = Setting.protocol
-  end
-  
-  # Overrides the create_mail method
-  def create_mail
-    # Removes the current user from the recipients and cc
-    # if he doesn't want to receive notifications about what he does
-    if User.current.pref[:no_self_notified]
-      recipients.delete(User.current.mail) if recipients
-      cc.delete(User.current.mail) if cc
-    end
-    # Blind carbon copy recipients
-    if Setting.bcc_recipients?
-      bcc([recipients, cc].flatten.compact.uniq)
-      recipients []
-      cc []
-    end    
-    super
-  end
-  
-  # Renders a message with the corresponding layout
-  def render_message(method_name, body)
-    layout = method_name.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
-    body[:content_for_layout] = render(:file => method_name, :body => body)
-    ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}")
-  end
-  
-  # Makes partial rendering work with Rails 1.2 (retro-compatibility)
-  def self.controller_path
-    ''
-  end unless respond_to?('controller_path')
 end

app/models/member.rb

@@ -23,16 +23,7 @@ class Member < ActiveRecord::Base
   validates_presence_of :role, :user, :project
   validates_uniqueness_of :user_id, :scope => :project_id
 
-  def validate
-    errors.add :role_id, :activerecord_error_invalid if role && !role.member?
-  end
-  
   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,67 +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'
-  
-  acts_as_searchable :columns => ['subject', 'content'],
-                     :include => :board,
-                     :project_key => 'project_id',
-                     :date_column => 'created_on'
-  acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
-                :description => :content,
-                :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id, :id => o.id}}
-  
-  attr_protected :locked, :sticky
-  validates_presence_of :subject, :content
-  validates_length_of :subject, :maximum => 255
-  
-  def validate_on_create
-    # Can not reply to a locked topic
-    errors.add_to_base 'Topic is locked' if root.locked?
-  end
-  
-  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 after_destroy
-    # The following line is required so that the previous counter
-    # updates (due to children removal) are not overwritten
-    board.reload
-    board.decrement! :messages_count
-    board.decrement! :topics_count unless parent
-  end
-  
-  def sticky?
-    sticky == 1
-  end
-  
-  def project
-    board.project
-  end
-end

app/models/message_observer.rb

@@ -1,27 +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 the authors of the thread
-    recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}
-    # send notification to the board watchers
-    recipients += message.board.watcher_recipients
-    recipients = recipients.compact.uniq
-    Mailer.deliver_message_posted(message, recipients) if !recipients.empty? && Setting.notified_events.include?('message_posted')
-  end
-end

app/models/news.rb

@@ -21,14 +21,9 @@ class News < ActiveRecord::Base
   has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
   
   validates_presence_of :title, :description
-  validates_length_of :title, :maximum => 60
-  validates_length_of :summary, :maximum => 255
-
-  acts_as_searchable :columns => ['title', 'description']
-  acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
   
   # returns latest news for projects visible by user
   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

@@ -0,0 +1,65 @@
+# 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 Permission < ActiveRecord::Base
+  has_and_belongs_to_many :roles
+
+  validates_presence_of :controller, :action, :description
+
+  GROUPS = {
+    100 => :label_project,
+    200 => :label_member_plural,
+    300 => :label_version_plural,
+    400 => :label_issue_category_plural,
+    600 => :label_query_plural,
+    1000 => :label_issue_plural,
+    1100 => :label_news_plural,
+    1200 => :label_document_plural,
+    1300 => :label_attachment_plural,
+    1400 => :label_repository
+  }.freeze
+  
+  @@cached_perms_for_public = nil
+  @@cached_perms_for_roles = nil
+  
+  def name
+    self.controller + "/" + self.action
+  end
+  
+  def group_id
+    (self.sort / 100)*100
+  end
+  
+  def self.allowed_to_public(action)
+    @@cached_perms_for_public ||= find(:all, :conditions => ["is_public=?", true]).collect {|p| "#{p.controller}/#{p.action}"}
+    @@cached_perms_for_public.include? action
+  end
+  
+  def self.allowed_to_role(action, role)
+    @@cached_perms_for_roles ||=
+      begin
+        perms = {}
+        find(:all, :include => :roles).each {|p| perms.store "#{p.controller}/#{p.action}", p.roles.collect {|r| r.id } }
+        perms
+      end
+    allowed_to_public(action) or (@@cached_perms_for_roles[action] and @@cached_perms_for_roles[action].include? role)
+  end
+  
+  def self.allowed_to_role_expired
+    @@cached_perms_for_roles = nil
+  end
+end

app/models/project.rb

@@ -16,169 +16,50 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 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 :members, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
   has_many :users, :through => :members
   has_many :custom_values, :dependent => :delete_all, :as => :customized
-  has_many :enabled_modules, :dependent => :delete_all
+  has_many :issues, :dependent => :destroy, :order => "issues.created_on DESC", :include => [:status, :tracker]
-  has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
-  has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
-  has_many :issue_changes, :through => :issues, :source => :journals
-  has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
-  has_many :time_entries, :dependent => :delete_all
   has_many :queries, :dependent => :delete_all
   has_many :documents, :dependent => :destroy
   has_many :news, :dependent => :delete_all, :include => :author
-  has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
+  has_many :issue_categories, :dependent => :delete_all, :order => "issue_categories.name"
-  has_many :boards, :order => "position ASC"
   has_one :repository, :dependent => :destroy
-  has_many :changesets, :through => :repository
+  has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_projects', :association_foreign_key => 'custom_field_id'
-  has_one :wiki, :dependent => :destroy
-  # Custom field for the project issues
-  has_and_belongs_to_many :custom_fields, 
-                          :class_name => 'IssueCustomField',
-                          :order => "#{CustomField.table_name}.position",
-                          :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
-                          :association_foreign_key => 'custom_field_id'
-                          
   acts_as_tree :order => "name", :counter_cache => true
 
-  acts_as_searchable :columns => ['name', 'description'], :project_key => 'id'
+  validates_presence_of :name, :description
-  acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
+  validates_uniqueness_of :name
-                :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}}
-
-  attr_protected :status, :enabled_module_names
-  
-  validates_presence_of :name, :description, :identifier
-  validates_uniqueness_of :name, :identifier
   validates_associated :custom_values, :on => :update
-  validates_associated :repository, :wiki
+  validates_associated :repository
-  validates_length_of :name, :maximum => 30
+  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-  validates_length_of :description, :maximum => 255
-  validates_length_of :homepage, :maximum => 60
-  validates_length_of :identifier, :in => 3..20
-  validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
-  
-  before_destroy :delete_all_members
-  
-  def identifier=(identifier)
-    super unless identifier_frozen?
-  end
-  
-  def identifier_frozen?
-    errors[:identifier].nil? && !(new_record? || identifier.blank?)
-  end
-  
-  def issues_with_subprojects(include_subprojects=false)
-    conditions = nil
-    if include_subprojects && !active_children.empty?
-      ids = [id] + active_children.collect {|c| c.id}
-      conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
-    end
-    conditions ||= ["#{Issue.table_name}.project_id = ?", id]
-    Issue.with_scope :find => { :conditions => conditions } do 
-      yield
-    end 
-  end
-
-  # Return all issues status changes for the project between the 2 given dates
-  def issues_status_changes(from, to)
-    Journal.find(:all, :include => [:issue, :details, :user],
-                       :conditions => ["#{Journal.table_name}.journalized_type = 'Issue'" +
-                                       " AND #{Issue.table_name}.project_id = ?" +
-                                       " AND #{JournalDetail.table_name}.prop_key = 'status_id'" +
-                                       " AND #{Journal.table_name}.created_on BETWEEN ? AND ?",
-                                       id, from, to+1])
-  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")	
+    find(:all, :limit => count, :conditions => visible_by(user), :order => "projects.created_on DESC")	
   end	
 
   def self.visible_by(user=nil)
-    if user && user.admin?
+    if user && !user.memberships.empty?
-      return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+      return ["projects.is_public = ? or projects.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')})", true]
-    elsif user && user.memberships.any?
-      return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
     else
-      return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
+      return ["projects.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
-  
-  # Deletes all project's members
-  def delete_all_members
-    Member.delete_all(['project_id = ?', id])
-  end
-  
-  # Users issues can be assigned to
-  def assignable_users
-    members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
-  end
-  
-  # Returns the mail adresses of users that should be always notified on project events
-  def recipients
-    members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
-  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 }
+    tracker.custom_fields.find(:all, :include => :projects, 
+                               :conditions => ["is_for_all=? or project_id=?", true, self.id])
+    #(CustomField.for_all + custom_fields).uniq
   end
   
   def all_custom_fields
-    @all_custom_fields ||= (IssueCustomField.for_all + custom_fields).uniq
+    @all_custom_fields ||= IssueCustomField.find(:all, :include => :projects, 
-  end
+                               :conditions => ["is_for_all=? or project_id=?", true, self.id])
-  
-  def <=>(project)
-    name.downcase <=> project.name.downcase
-  end
-  
-  def allows_to?(action)
-    if action.is_a? Hash
-      allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
-    else
-      allowed_permissions.include? action
-    end
-  end
-  
-  def module_enabled?(module_name)
-    module_name = module_name.to_s
-    enabled_modules.detect {|m| m.name == module_name}
-  end
-  
-  def enabled_module_names=(module_names)
-    enabled_modules.clear
-    module_names = [] unless module_names && module_names.is_a?(Array)
-    module_names.each do |name|
-      enabled_modules << EnabledModule.new(:name => name.to_s)
-    end
   end
 
 protected
@@ -186,16 +67,4 @@ protected
     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
-  
-private
-  def allowed_permissions
-    @allowed_permissions ||= begin
-      module_names = enabled_modules.collect {|m| m.name}
-      Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
-    end
-  end
-
-  def allowed_actions
-    @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
-  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
@@ -15,49 +15,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-class QueryColumn  
-  attr_accessor :name, :sortable
-  include GLoc
-  
-  def initialize(name, options={})
-    self.name = name
-    self.sortable = options[:sortable]
-  end
-  
-  def caption
-    set_language_if_valid(User.current.language)
-    l("field_#{name}")
-  end
-end
-
-class QueryCustomFieldColumn < QueryColumn
-
-  def initialize(custom_field)
-    self.name = "cf_#{custom_field.id}".to_sym
-    self.sortable = false
-    @cf = custom_field
-  end
-  
-  def caption
-    @cf.name
-  end
-  
-  def custom_field
-    @cf
-  end
-end
-
 class Query < ActiveRecord::Base
   belongs_to :project
   belongs_to :user
   serialize :filters
-  serialize :column_names
   
   attr_protected :project, :user
-  attr_accessor :executed_by
   
   validates_presence_of :name, :on => :save
-  validates_length_of :name, :maximum => 255
     
   @@operators = { "="   => :label_equals, 
                   "!"   => :label_not_equals,
@@ -65,13 +30,10 @@ class Query < ActiveRecord::Base
                   "c"   => :label_closed_issues,
                   "!*"  => :label_none,
                   "*"   => :label_all,
-                  ">="   => '>=',
-                  "<="   => '<=',
                   "<t+" => :label_in_less_than,
                   ">t+" => :label_in_more_than,
                   "t+"  => :label_in,
                   "t"   => :label_today,
-                  "w"   => :label_this_week,
                   ">t-" => :label_less_than_ago,
                   "<t-" => :label_more_than_ago,
                   "t-"  => :label_ago,
@@ -83,55 +45,28 @@ 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 => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
+                                 :date_past => [ ">t-", "<t-", "t-", "t" ],
-                                 :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
+                                 :text => [  "~", "!~" ] }
-                                 :string => [ "=", "~", "!", "!~" ],
-                                 :text => [  "~", "!~" ],
-                                 :integer => [ "=", ">=", "<=" ] }
 
   cattr_reader :operators_by_filter_type
 
-  @@available_columns = [
-    QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
-    QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
-    QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position"),
-    QueryColumn.new(:subject),
-    QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
-    QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on"),
-    QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
-    QueryColumn.new(:fixed_version),
-    QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
-    QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
-    QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
-    QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio"),
-    QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on"),
-  ]
-  cattr_reader :available_columns
-  
   def initialize(attributes = nil)
     super attributes
     self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-    @executed_by = User.current.logged? ? User.current : nil
+    self.is_public = true
-    set_language_if_valid(executed_by.language) if executed_by
   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
-          ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
+          ["o", "c", "!*", "*", "t"].include? operator_for(field)
     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.allowed_to?(:manage_public_queries, project)
-  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] } },       
@@ -141,42 +76,13 @@ class Query < ActiveRecord::Base
                            "created_on" => { :type => :date_past, :order => 9 },                        
                            "updated_on" => { :type => :date_past, :order => 10 },
                            "start_date" => { :type => :date, :order => 11 },
-                           "due_date" => { :type => :date, :order => 12 },
+                           "due_date" => { :type => :date, :order => 12 } }                          
-                           "done_ratio" =>  { :type => :integer, :order => 13 }}                          
+    unless project.nil?
-    
-    user_values = []
-    user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
-    if project
-      user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
-    elsif executed_by
-      # members of the user's projects
-      user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
-    end
-    @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
-    @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
-  
-    if project
       # project specific filters
+      @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
+      @available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
       @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 "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 }
-        else
-          options = { :type => :string, :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
@@ -216,129 +122,46 @@ 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 available_columns
-    return @available_columns if @available_columns
-    @available_columns = Query.available_columns
-    @available_columns += (project ? 
-                            project.custom_fields :
-                            IssueCustomField.find(:all, :conditions => {:is_for_all => true})
-                           ).collect {|cf| QueryCustomFieldColumn.new(cf) }      
-  end
-  
-  def columns
-    if has_default_columns?
-      available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
-    else
-      # preserve the column_names order
-      column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
-    end
-  end
-  
-  def column_names=(names)
-    names = names.select {|n| n.is_a?(Symbol) || !n.blank? } if names
-    names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym } if names
-    write_attribute(:column_names, names)
-  end
-  
-  def has_column?(column)
-    column_names && column_names.include?(column.name)
-  end
-  
-  def has_default_columns?
-    column_names.nil? || column_names.empty?
-  end
-
   def statement
-    # project/subprojects clause
+    sql = "1=1" 
-    clause = ''
+    sql << " AND issues.project_id=%d" % project.id if project
-    if project && has_filter?("subproject_id")
-      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
-      clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
-    elsif project
-      clause << "#{Issue.table_name}.project_id=%d" % project.id
-    else
-      clause << Project.visible_by(executed_by)
-    end
-    
-    # filters clauses
-    filters_clauses = []
     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?  
-            
+      sql = sql + " AND " unless sql.empty?      
-      sql = ''      
-      if field =~ /^cf_(\d+)$/
-        # custom field
-        db_table = CustomValue.table_name
-        db_field = 'value'
-        sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.customized_id FROM #{db_table} where #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} AND "
-      else
-        # regular field
-        db_table = Issue.table_name
-        db_field = field
-        sql << '('
-      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 ">="
-        sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
-      when "<="
-        sql = sql + "#{db_table}.#{db_field} <= #{v.first.to_i}"
       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 "w"
-        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week.yesterday)]
       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 << ')'
-      filters_clauses << sql
     end if filters and valid?
-    
+    sql
-    clause << ' AND ' unless clause.empty?
-    clause << filters_clauses.join(' AND ') unless filters_clauses.empty?
-    clause
   end
 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,75 +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 supports_annotate?
-    scm.supports_annotate?
-  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
-  
-  # Default behaviour: we search in cached changesets
-  def changesets_for_path(path)
-    path = "/#{path}" unless path.starts_with?('/')
-    Change.find(:all, :include => :changeset, 
-      :conditions => ["repository_id = ? AND path = ?", id, path],
-      :order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset)
-  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/bazaar.rb

@@ -1,86 +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/bazaar_adapter'
-
-class Repository::Bazaar < Repository
-  attr_protected :root_url
-  validates_presence_of :url
-
-  def scm_adapter
-    Redmine::Scm::Adapters::BazaarAdapter
-  end
-  
-  def self.scm_name
-    'Bazaar'
-  end
-  
-  def entries(path=nil, identifier=nil)
-    entries = scm.entries(path, identifier)
-    if entries
-      entries.each do |e|
-        next if e.lastrev.revision.blank?
-        c = Change.find(:first,
-                        :include => :changeset,
-                        :conditions => ["#{Change.table_name}.revision = ? and #{Changeset.table_name}.repository_id = ?", e.lastrev.revision, id],
-                        :order => "#{Changeset.table_name}.revision DESC")
-        if c
-          e.lastrev.identifier = c.changeset.revision
-          e.lastrev.name = c.changeset.revision
-          e.lastrev.author = c.changeset.committer
-        end
-      end
-    end
-  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,
-                                           :scmid => revision.scmid,
-                                           :comments => revision.message)
-              
-              revision.paths.each do |change|
-                Change.create(:changeset => changeset,
-                              :action => change[:action],
-                              :path => change[:path],
-                              :revision => change[:revision])
-              end
-            end
-          end unless revisions.nil?
-          identifier_from = identifier_to + 1
-        end
-      end
-    end
-  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 = changesets.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,74 +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|svn\+ssh|file):\/\/.+/i
-
-  def scm_adapter
-    Redmine::Scm::Adapters::SubversionAdapter
-  end
-  
-  def self.scm_name
-    'Subversion'
-  end
-
-  def changesets_for_path(path)
-    revisions = scm.revisions(path)
-    revisions ? changesets.find_all_by_revision(revisions.collect(&:identifier), :order => "committed_on DESC") : []
-  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

@@ -16,93 +16,18 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Role < ActiveRecord::Base
-  # Built-in roles
+  before_destroy :check_integrity  
-  BUILTIN_NON_MEMBER = 1
+  has_and_belongs_to_many :permissions
-  BUILTIN_ANONYMOUS  = 2
-  
-  before_destroy :check_deletable
   has_many :workflows, :dependent => :delete_all
   has_many :members
   acts_as_list
 
-  serialize :permissions
-  attr_protected :builtin
-
   validates_presence_of :name
   validates_uniqueness_of :name
-  validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
 
-  def permissions
-    read_attribute(:permissions) || []
-  end
-  
-  def permissions=(perms)
-    perms = perms.collect {|p| p.to_sym unless p.blank? }.compact if perms
-    write_attribute(:permissions, perms)
-  end
-  
-  def <=>(role)
-    position <=> role.position
-  end
-  
-  # Return true if the role is a builtin role
-  def builtin?
-    self.builtin != 0
-  end
-  
-  # Return true if the role is a project member role
-  def member?
-    !self.builtin?
-  end
-  
-  # Return true if role is allowed to do the specified action
-  # action can be:
-  # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
-  # * a permission Symbol (eg. :edit_project)
-  def allowed_to?(action)
-    if action.is_a? Hash
-      allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
-    else
-      allowed_permissions.include? action
-    end
-  end
-  
-  # Return all the permissions that can be given to the role
-  def setable_permissions
-    setable_permissions = Redmine::AccessControl.permissions - Redmine::AccessControl.public_permissions
-    setable_permissions -= Redmine::AccessControl.members_only_permissions if self.builtin == BUILTIN_NON_MEMBER
-    setable_permissions -= Redmine::AccessControl.loggedin_only_permissions if self.builtin == BUILTIN_ANONYMOUS
-    setable_permissions
-  end
-
-  # Find all the roles that can be given to a project member
-  def self.find_all_givable
-    find(:all, :conditions => {:builtin => 0}, :order => 'position')
-  end
-
-  # Return the builtin 'non member' role
-  def self.non_member
-    find(:first, :conditions => {:builtin => BUILTIN_NON_MEMBER}) || raise('Missing non-member builtin role.')
-  end
-
-  # Return the builtin 'anonymous' role 
-  def self.anonymous
-    find(:first, :conditions => {:builtin => BUILTIN_ANONYMOUS}) || raise('Missing anonymous builtin role.')
-  end
-
-  
 private
-  def allowed_permissions
+  def check_integrity
-    @allowed_permissions ||= permissions + Redmine::AccessControl.public_permissions.collect {|p| p.name}
+    raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])
-  end
-
-  def allowed_actions
-    @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
-  end
-    
-  def check_deletable
-    raise "Can't delete role" if members.any?
-    raise "Can't delete builtin role" if builtin?
   end
 end

app/models/setting.rb

@@ -17,67 +17,31 @@
 
 class Setting < ActiveRecord::Base
 
-  DATE_FORMATS = [
-	'%Y-%m-%d',
-	'%d/%m/%Y',
-	'%d.%m.%Y',
-	'%d-%m-%Y',
-	'%m/%d/%Y',
-	'%d %b %Y',
-	'%d %B %Y',
-	'%b %d, %Y',
-	'%B %d, %Y'
-    ]
-    
-  TIME_FORMATS = [
-    '%H:%M',
-    '%I:%M %p'
-    ]
-  
   cattr_accessor :available_settings
   @@available_settings = YAML::load(File.open("#{RAILS_ROOT}/config/settings.yml"))
-  Redmine::Plugin.registered_plugins.each do |id, plugin|
-    next unless plugin.settings
-    @@available_settings["plugin_#{id}"] = {'default' => plugin.settings[:default], 'serialized' => true}    
-  end
 
   validates_uniqueness_of :name
   validates_inclusion_of :name, :in => @@available_settings.keys
   validates_numericality_of :value, :only_integer => true, :if => Proc.new { |setting| @@available_settings[setting.name]['format'] == 'int' }  
   
-  # Hash used to cache setting values
+  def self.get(name)
-  @cached_settings = {}
+    name = name.to_s
-  @cached_cleared_on = Time.now
+    setting = find_by_name(name)
-  
+    setting ||= new(:name => name, :value => @@available_settings[name]['default']) if @@available_settings.has_key? name
-  def value
+    setting
-    v = read_attribute(:value)
-    # Unserialize serialized settings
-    v = YAML::load(v) if @@available_settings[name]['serialized'] && v.is_a?(String)
-    v
   end
   
-  def value=(v)
-    v = v.to_yaml if v && @@available_settings[name]['serialized']
-    write_attribute(:value, v)
-  end
-  
-  # Returns the value of the setting named name
   def self.[](name)
-    v = @cached_settings[name]
+    get(name).value
-    v ? v : (@cached_settings[name] = find_or_default(name).value)
   end
   
-  def self.[]=(name, v)
+  def self.[]=(name, value)
-    setting = find_or_default(name)
+    setting = get(name)
-    setting.value = (v ? v : "")
+    setting.value = (value ? value.to_s : "")
-    @cached_settings[name] = nil
     setting.save
     setting.value
   end
   
-  # Defines getter and setter for each setting
-  # Then setting values can be read using: Setting.some_setting_name
-  # or set using Setting.some_setting_name = "some value"
   @@available_settings.each do |name, params|
     src = <<-END_SRC
     def self.#{name}
@@ -85,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)
@@ -94,26 +58,4 @@ class Setting < ActiveRecord::Base
     END_SRC
     class_eval src, __FILE__, __LINE__
   end
-  
-  # Checks if settings have changed since the values were read
-  # and clears the cache hash if it's the case
-  # Called once per request
-  def self.check_cache
-    settings_updated_on = Setting.maximum(:updated_on)
-    if settings_updated_on && @cached_cleared_on <= settings_updated_on
-      @cached_settings.clear
-      @cached_cleared_on = Time.now
-      logger.info "Settings cache cleared." if logger
-    end
-  end
-  
-private
-  # Returns the Setting instance for the setting named name
-  # (record found in database or new record with default value)
-  def self.find_or_default(name)
-    name = name.to_s
-    raise "There's no setting named #{name}" unless @@available_settings.has_key?(name)    
-    setting = find_by_name(name)
-    setting ||= new(:name => name, :value => @@available_settings[name]['default']) if @@available_settings.has_key? name
-  end
 end

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

app/models/token.rb

@@ -31,7 +31,7 @@ class Token < ActiveRecord::Base
   
   # Delete all expired tokens
   def self.destroy_expired
-    Token.delete_all ["action <> 'feeds' AND created_on < ?", Time.now - @@validity_time]
+    Token.delete_all ["created_on < ?", Time.now - @@validity_time]
   end
   
 private

app/models/tracker.rb

@@ -19,24 +19,13 @@ class Tracker < ActiveRecord::Base
   before_destroy :check_integrity  
   has_many :issues
   has_many :workflows, :dependent => :delete_all
-  has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
+  has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_trackers', :association_foreign_key => 'custom_field_id'
   acts_as_list
 
   validates_presence_of :name
   validates_uniqueness_of :name
-  validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
 
-  def to_s; name end
-  
-  def <=>(tracker)
-    name <=> tracker.name
-  end
-
-  def self.all
-    find(:all, :order => 'position')
-  end
-  
 private
   def check_integrity
     raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])

app/models/user.rb

@@ -18,18 +18,10 @@
 require "digest/sha1"
 
 class User < ActiveRecord::Base
-  # Account statuses
+  has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => :delete_all
-  STATUS_ANONYMOUS  = 0
-  STATUS_ACTIVE     = 1
-  STATUS_REGISTERED = 2
-  STATUS_LOCKED     = 3
-
-  has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name", :dependent => :delete_all
   has_many :projects, :through => :memberships
   has_many :custom_values, :dependent => :delete_all, :as => :customized
-  has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
   has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
-  has_one :rss_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'"
   belongs_to :auth_source
   
   attr_accessor :password, :password_confirmation
@@ -37,23 +29,21 @@ class User < ActiveRecord::Base
   # Prevents unauthorized assignments
   attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
 	
-  validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
+  validates_presence_of :login, :firstname, :lastname, :mail
   validates_uniqueness_of :login, :mail	
   # Login must contain lettres, numbers, underscores only
-  validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
-  validates_length_of :login, :maximum => 30
   validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
-  validates_length_of :firstname, :lastname, :maximum => 30
+  validates_format_of :login, :with => /^[a-z0-9_\-@\.]+$/i
-  validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
+  validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
-  validates_length_of :mail, :maximum => 60, :allow_nil => true
+  # Password length between 4 and 12
-  validates_length_of :password, :minimum => 4, :allow_nil => true
+  validates_length_of :password, :in => 4..12, :allow_nil => true
   validates_confirmation_of :password, :allow_nil => true
   validates_associated :custom_values, :on => :update
 
-  def before_create
+  # Account statuses
-    self.mail_notification = false
+  STATUS_ACTIVE     = 1
-    true
+  STATUS_REGISTERED = 2
-  end
+  STATUS_LOCKED     = 3
 
   def before_save
     # update hashed_password if password was set
@@ -106,8 +96,12 @@ class User < ActiveRecord::Base
   end
 	
   # Return user's full name for display
+  def display_name
+    firstname + " " + lastname
+  end
+  
   def name
-    "#{firstname} #{lastname}"
+    display_name
   end
   
   def active?
@@ -126,130 +120,23 @@ class User < ActiveRecord::Base
     User.hash_password(clear_password) == self.hashed_password
   end
   
+  def role_for_project(project_id)
+    @role_for_projects ||=
+      begin
+        roles = {}
+        self.memberships.each { |m| roles.store m.project_id, m.role_id }
+        roles
+      end
+    @role_for_projects[project_id]
+  end
+  
   def pref
     self.preference ||= UserPreference.new(:user => self)
   end
 	
-  def time_zone
-    self.pref.time_zone.nil? ? nil : TimeZone[self.pref.time_zone]
-  end
-  
-  # Return user's RSS key (a 40 chars long string), used to access feeds
-  def rss_key
-    token = self.rss_token || Token.create(:user => self, :action => 'feeds')
-    token.value
-  end
-  
-  # Return an array of project ids for which the user has explicitly turned mail notifications on
-  def notified_projects_ids
-    @notified_projects_ids ||= memberships.select {|m| m.mail_notification?}.collect(&:project_id)
-  end
-  
-  def notified_project_ids=(ids)
-    Member.update_all("mail_notification = #{connection.quoted_false}", ['user_id = ?', id])
-    Member.update_all("mail_notification = #{connection.quoted_true}", ['user_id = ? AND project_id IN (?)', id, ids]) if ids && !ids.empty?
-    @notified_projects_ids = nil
-    notified_projects_ids
-  end
-  
-  def self.find_by_rss_key(key)
-    token = Token.find_by_value(key)
-    token && token.user.active? ? token.user : nil
-  end
-  
-  def self.find_by_autologin_key(key)
-    token = Token.find_by_action_and_value('autologin', key)
-    token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
-  end
-
-  def <=>(user)
-    user.nil? ? -1 : (lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname)
-  end
-  
-  def to_s
-    name
-  end
-  
-  def logged?
-    true
-  end
-  
-  # Return user's role for project
-  def role_for_project(project)
-    # No role on archived projects
-    return nil unless project && project.active?
-    if logged?
-      # Find project membership
-      membership = memberships.detect {|m| m.project_id == project.id}
-      if membership
-        membership.role
-      else
-        @role_non_member ||= Role.non_member
-      end
-    else
-      @role_anonymous ||= Role.anonymous
-    end
-  end
-  
-  # Return true if the user is a member of project
-  def member_of?(project)
-    role_for_project(project).member?
-  end
-  
-  # Return true if the user is allowed to do the specified action on project
-  # action can be:
-  # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
-  # * a permission Symbol (eg. :edit_project)
-  def allowed_to?(action, project)
-    # No action allowed on archived projects
-    return false unless project.active?
-    # No action allowed on disabled modules
-    return false unless project.allows_to?(action)
-    # Admin users are authorized for anything else
-    return true if admin?
-    
-    role = role_for_project(project)
-    return false unless role
-    role.allowed_to?(action) && (project.is_public? || role.member?)
-  end
-  
-  def self.current=(user)
-    @current_user = user
-  end
-  
-  def self.current
-    @current_user ||= User.anonymous
-  end
-  
-  def self.anonymous
-    return @anonymous_user if @anonymous_user
-    anonymous_user = AnonymousUser.find(:first)
-    if anonymous_user.nil?
-      anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :mail => '', :login => '', :status => 0)
-      raise 'Unable to create the anonymous user.' if anonymous_user.new_record?
-    end
-    @anonymous_user = anonymous_user
-  end
-  
 private
   # Return password digest
   def self.hash_password(clear_password)
     Digest::SHA1.hexdigest(clear_password || "")
   end
 end
-
-class AnonymousUser < User
-  
-  def validate_on_create
-    # There should be only one AnonymousUser in the database
-    errors.add_to_base 'An anonymous user already exists.' if AnonymousUser.find(:first)
-  end
-  
-  # Overrides a few properties
-  def logged?; false end
-  def admin; false end
-  def name; 'Anonymous' end
-  def mail; nil end
-  def time_zone; nil end
-  def rss_key; nil end
-end

app/models/user_preference.rb

@@ -26,15 +26,11 @@ class UserPreference < ActiveRecord::Base
     self.others ||= {}
   end
   
-  def before_save
-    self.others ||= {}
-  end
-  
   def [](attr_name)
     if attribute_present? attr_name
       super
     else
-      others ? others[attr_name] : nil
+      others[attr_name]
     end
   end
   
@@ -42,8 +38,7 @@ class UserPreference < ActiveRecord::Base
     if attribute_present? attr_name
       super
     else
-      self.others ||= {}
+      others.store attr_name, value
-      self.others.store attr_name, value
     end
   end
 end

app/models/version.rb

@@ -23,71 +23,7 @@ class Version < ActiveRecord::Base
 
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]
-  validates_length_of :name, :maximum => 30
+  validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date
-  validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date, :allow_nil => true
-  
-  def start_date
-    effective_date
-  end
-  
-  def due_date
-    effective_date
-  end
-  
-  # Returns true if the version is completed: due date reached and no open issues
-  def completed?
-    effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
-  end
-  
-  def completed_pourcent
-    if fixed_issues.count == 0
-      0
-    elsif open_issues_count == 0
-      100
-    else
-      (closed_issues_count * 100 + Issue.sum('done_ratio', :include => 'status', :conditions => ["fixed_version_id = ? AND is_closed = ?", id, false]).to_f) / fixed_issues.count
-    end
-  end
-  
-  def closed_pourcent
-    if fixed_issues.count == 0
-      0
-    else
-      closed_issues_count * 100.0 / fixed_issues.count
-    end
-  end
-  
-  # Returns true if the version is overdue: due date reached and some open issues
-  def overdue?
-    effective_date && (effective_date < Date.today) && (open_issues_count > 0)
-  end
-  
-  def open_issues_count
-    @open_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, false], :include => :status)
-  end
-
-  def closed_issues_count
-    @closed_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, true], :include => :status)
-  end
-  
-  def wiki_page
-    if project.wiki && !wiki_page_title.blank?
-      @wiki_page ||= project.wiki.find_page(wiki_page_title)
-    end
-    @wiki_page
-  end
-  
-  def to_s; name end
-  
-  # Versions are sorted by effective_date 
-  # Those with no effective_date are at the end, sorted by name
-  def <=>(version)
-    if self.effective_date
-      version.effective_date ? (self.effective_date <=> version.effective_date) : -1
-    else
-      version.effective_date ? 1 : (self.name <=> version.name)
-    end
-  end
   
 private
   def check_integrity

app/models/watcher.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.
-
-class Watcher < ActiveRecord::Base
-  belongs_to :watchable, :polymorphic => true
-  belongs_to :user
-  
-  validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
-end

app/models/wiki.rb

@@ -1,54 +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 Wiki < ActiveRecord::Base
-  belongs_to :project
-  has_many :pages, :class_name => 'WikiPage', :dependent => :destroy
-  has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all
-  
-  validates_presence_of :start_page
-  validates_format_of :start_page, :with => /^[^,\.\/\?\;\|\:]*$/
-  
-  # find the page with the given title
-  # if page doesn't exist, return a new page
-  def find_or_new_page(title)
-    title = start_page if title.blank?
-    find_page(title) || WikiPage.new(:wiki => self, :title => Wiki.titleize(title))
-  end
-  
-  # find the page with the given title
-  def find_page(title, options = {})
-    title = start_page if title.blank?
-    title = Wiki.titleize(title)
-    page = pages.find_by_title(title)
-    if !page && !(options[:with_redirect] == false)
-      # search for a redirect
-      redirect = redirects.find_by_title(title)
-      page = find_page(redirect.redirects_to, :with_redirect => false) if redirect
-    end
-    page
-  end
-  
-  # turn a string into a valid page title
-  def self.titleize(title)
-    # replace spaces with _ and remove unwanted caracters
-    title = title.gsub(/\s+/, '_').delete(',./?;|:') if title
-    # upcase the first letter
-    title = (title.slice(0..0).upcase + (title.slice(1..-1) || '')) if title
-    title
-  end  
-end