jro_apps/redmine Commit - r546:413247ee5b16

Added the ability to archive projects:...

Jean-Philippe Lang -

r546:413247ee5b16

parent child

Context file:

r546:413247ee5b16

Expand all files

app/sweepers/project_sweeper.rb created 644 +40 0

@@ -0,0 +1,40
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class ProjectSweeper < ActionController::Caching::Sweeper
	19	observe Project
	20
	21	def before_save(project)
	22	if project.new_record?
	23	expire_cache_for(project.parent) if project.parent
	24	else
	25	project_before_update = Project.find(project.id)
	26	return if project_before_update.parent_id == project.parent_id && project_before_update.status == project.status
	27	expire_cache_for(project.parent) if project.parent
	28	expire_cache_for(project_before_update.parent) if project_before_update.parent
	29	end
	30	end
	31
	32	def after_destroy(project)
	33	expire_cache_for(project.parent) if project.parent
	34	end
	35
	36	private
	37	def expire_cache_for(project)
	38	expire_fragment(Regexp.new("projects/(calendar\|gantt)/#{project.id}\\."))
	39	end
	40	end

db/migrate/051_add_project_status.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddProjectStatus < ActiveRecord::Migration
	2	def self.up
	3	add_column :projects, :status, :integer, :default => 1, :null => false
	4	end
	5
	6	def self.down
	7	remove_column :projects, :status
	8	end
	9	end

public/images/unlock.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

test/integration/projects_test.rb created 644 +44 0

@@ -0,0 +1,44
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require "#{File.dirname(__FILE__)}/../test_helper"
	19
	20	class ProjectsTest < ActionController::IntegrationTest
	21	fixtures :projects, :users, :members
	22
	23	def test_archive_project
	24	subproject = Project.find(1).children.first
	25	log_user("admin", "admin")
	26	get "admin/projects"
	27	assert_response :success
	28	assert_template "admin/projects"
	29	post "projects/archive", :id => 1
	30	assert_redirected_to "admin/projects"
	31	assert !Project.find(1).active?
	32
	33	get "projects/show", :id => 1
	34	assert_response :missing
	35	get "projects/show", :id => subproject.id
	36	assert_response :missing
	37
	38	post "projects/unarchive", :id => 1
	39	assert_redirected_to "admin/projects"
	40	assert Project.find(1).active?
	41	get "projects/show", :id => 1
	42	assert_response :success
	43	end
	44	end

app/controllers/admin_controller.rb +9 -3

               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,
 ,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
+                                    :conditions => conditions,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset

app/controllers/application.rb +10 0

               # authorizes the user for the requested action.
               def authorize(ctrl = params[:controller], action = params[:action])
+                unless @project.active?
+                  @project = nil
+                  render_404
+                  return false
+                end
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ ctrl, action ]
                   return true
               # make sure that the user is a member of the project (or admin) if project is private
               # used as a before_filter for actions that do not require any particular permission on the project
               def check_project_privacy
+                unless @project.active?
+                  @project = nil
+                  render_404
+                  return false
+                end
                 return true if @project.is_public?
                 return false unless logged_in_user
                 return true if logged_in_user.admin? || logged_in_user_membership

app/controllers/projects_controller.rb +19 -4

             class ProjectsController < ApplicationController
               layout 'base'
-              before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
+              before_filter :find_project, :except => [ :index, :list, :add ]
-              before_filter :require_admin, :only => [ :add, :destroy ]
+              before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
+              before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
+              cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
               cache_sweeper :issue_sweeper, :only => [ :add_issue ]
               helper :sort
               def show
                 @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}
-                @subprojects = @project.children if @project.children.size > 0
+                @subprojects = @project.active_children
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @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])
                 end
               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.destroy
+                  @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
+                # hide project in layout
+                @project = nil
               end
               # Add a new issue category to @project

app/controllers/reports_controller.rb +4 -4

                   render :template => "reports/issue_report_details"
                 when "subproject"
                   @field = "project_id"
-                  @rows = @project.children
+                  @rows = @project.active_children
                   @data = issues_by_subproject
                   @report_title = l(:field_subproject)
                   render :template => "reports/issue_report_details"
                   @priorities = Enumeration::get_values('IPRI')
                   @categories = @project.issue_categories
                   @authors = @project.members.collect { |m| m.user }
-                  @subprojects = @project.children
+                  @subprojects = @project.active_children
                   issues_by_tracker
                   issues_by_version
                   issues_by_priority
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s
                                                             where
                                                               i.status_id=s.id
-                                                              and i.project_id IN (#{@project.children.collect{|p| p.id}.join(',')})
+                                                              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.children.any?
+                                                            group by s.id, s.is_closed, i.project_id") if @project.active_children.any?
                 @issues_by_subproject ||= []
               end
             end

app/controllers/users_controller.rb +1 -1

                 end
                 @auth_sources = AuthSource.find(:all)
                 @roles = Role.find(:all, :order => 'position')
-                @projects = Project.find(:all) - @user.projects
+                @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
                 @membership ||= Member.new
               end

app/helpers/admin_helper.rb +4 0

             # 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/models/project.rb +33 -7

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Project < ActiveRecord::Base
+              # Project statuses
+              STATUS_ACTIVE     = 1
+              STATUS_ARCHIVED   = 9
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
               has_many :members, :dependent => :delete_all, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
               has_many :users, :through => :members
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
               acts_as_tree :order => "name", :counter_cache => true
+              attr_protected :status
               validates_presence_of :name, :description, :identifier
               validates_uniqueness_of :name, :identifier
               validates_associated :custom_values, :on => :update
               def issues_with_subprojects(include_subprojects=false)
                 conditions = nil
-                if include_subprojects && children.size > 0
+                if include_subprojects && !active_children.empty?
-                  ids = [id] + children.collect {|c| c.id}
+                  ids = [id] + active_children.collect {|c| c.id}
                   conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
-                else
-                  conditions = ["#{Issue.table_name}.project_id = ?", id]
                 end
+                conditions ||= ["#{Issue.table_name}.project_id = ?", id]
                 Issue.with_scope :find => { :conditions => conditions } do
                   yield
                 end
               def self.visible_by(user=nil)
                 if user && user.admin?
-                  return nil
+                  return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
                 elsif user && !user.memberships.empty?
-                  return ["#{Project.table_name}.is_public = ? or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')})", true]
+                  return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = ? or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))", true]
                 else
-                  return ["#{Project.table_name}.is_public = ?", true]
+                  return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = ?", true]
+                end
+              end
+              def active?
+                self.status == STATUS_ACTIVE
+              end
+              def archive
+                # Archive subprojects if any
+                children.each do |subproject|
+                  subproject.archive
                 end
+                update_attribute :status, STATUS_ARCHIVED
+              end
+              def unarchive
+                return false if parent && !parent.active?
+                update_attribute :status, STATUS_ACTIVE
+              end
+              def active_children
+                children.select {|child| child.active?}
               end
               # Returns an array of all custom fields enabled for project issues

app/models/query.rb +3 -3

                   @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values }
                   @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
                   @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
-                  unless @project.children.empty?
+                  unless @project.active_children.empty?
-                    @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.children.collect{|s| [s.name, s.id.to_s] } }
+                    @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
                   if operator_for("subproject_id") == "="
                     subproject_ids = values_for("subproject_id").each(&:to_i)
                   else
-                    subproject_ids = project.children.collect{|p| p.id}
+                    subproject_ids = project.active_children.collect{|p| p.id}
                   end
                   sql << " AND #{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
                 else

app/models/user.rb +1 -1

               STATUS_REGISTERED = 2
               STATUS_LOCKED     = 3
-              has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :order => "#{Project.table_name}.name", :dependent => :delete_all
+              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_one :preference, :dependent => :destroy, :class_name => 'UserPreference'

app/views/admin/projects.rhtml +21 -5

             <h2><%=l(:label_project_plural)%></h2>
+            <% form_tag() do %>
+            <fieldset><legend><%= l(:label_filter_plural) %></legend>
+            <label><%= l(:field_status) %> :</label>
+            <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+            <%= submit_tag l(:button_apply), :class => "small" %>
+            </fieldset>
+            <% end %>
+            &nbsp;
             <table class="list">
               <thead><tr>
             	<%= sort_header_tag('name', :caption => l(:label_project)) %>
             	<th><%=l(:label_subproject_plural)%></th>
             	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
                 <th></th>
+                <th></th>
               </tr></thead>
               <tbody>
             <% for project in @projects %>
               <tr class="<%= cycle("odd", "even") %>">
-            	<td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %>
+            	<td><%= project.active? ? link_to(project.name, :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
             	<td><%=h project.description %>
             	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
             	<td align="center"><%= project.children.size %>
             	<td align="center"><%= format_date(project.created_on) %>
-              <td align="center">
+              <td align="center" style="width:10%">
-                <%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %>
+                <small>
+                <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project }, :method => :post, :class => 'icon icon-lock') if project.active? %>
+                <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
+                </small>
+              </td>
+              <td align="center" style="width:10%">
+                <small><%= link_to(l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => 'icon icon-del') %></small>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
-            <p><%= pagination_links_full @project_pages %>
+            <p><%= pagination_links_full @project_pages, :status => @status %>
-            [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>
  No newline at end of file
+            [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>

app/views/my/blocks/_issuesassignedtome.rhtml +1 -1

             <h3><%=l(:label_assigned_to_me_issues)%></h3>
             <% assigned_issues = Issue.find(:all,
-                                            :conditions => ["assigned_to_id=? AND #{IssueStatus.table_name}.is_closed=?", user.id, false],
+                                            :conditions => ["assigned_to_id=? AND #{IssueStatus.table_name}.is_closed=? AND #{Project.table_name}.status=#{Project::STATUS_ACTIVE}", user.id, false],
                                             :limit => 10,
                                             :include => [ :status, :project, :tracker ],
                                             :order => "#{Issue.table_name}.updated_on DESC") %>

app/views/my/blocks/_issuesreportedbyme.rhtml +1 -1

             <h3><%=l(:label_reported_issues)%></h3>
             <% reported_issues = Issue.find(:all,
-                                            :conditions => ["author_id=?", user.id],
+                                            :conditions => ["author_id=? AND #{Project.table_name}.status=#{Project::STATUS_ACTIVE}", user.id],
                                             :limit => 10,
                                             :include => [ :status, :project, :tracker ],
                                             :order => "#{Issue.table_name}.updated_on DESC") %>

app/views/my/blocks/_issueswatched.rhtml +1 -1

             <% watched_issues = Issue.find(:all,
                                            :include => [:status, :project, :tracker, :watchers],
                                            :limit => 10,
-                                           :conditions => ["#{Watcher.table_name}.user_id = ?", user.id],
+                                           :conditions => ["#{Watcher.table_name}.user_id = ? AND #{Project.table_name}.status=#{Project::STATUS_ACTIVE}", user.id],
                                            :order => "#{Issue.table_name}.updated_on DESC") %>
             <%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
             <% if watched_issues.length > 0 %>

app/views/projects/calendar.rhtml +1 -1

                   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
                   <%= tracker.name %><br />
                 <% end %>
-                <% if @project.children.any? %>
+                <% if @project.active_children.any? %>
                 <p><strong><%=l(:label_subproject_plural)%></strong></p>
                 <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
                 <% end %>

app/views/projects/destroy.rhtml +2 -2

             <h2><%=l(:label_confirmation)%></h2>
             <div class="box">
             <center>
-            <p><strong><%= @project.name %></strong><br />
+            <p><strong><%= @project_to_destroy.name %></strong><br />
             <%=l(:text_project_destroy_confirmation)%></p>
             <p>
-                <% form_tag({:controller => 'projects', :action => 'destroy', :id => @project}) do %>
+                <% form_tag({:controller => 'projects', :action => 'destroy', :id => @project_to_destroy}) do %>
                 <%= hidden_field_tag "confirm", 1 %>
                 <%= submit_tag l(:button_delete) %>
                 <% end %>

app/views/projects/gantt.rhtml +1 -1

                   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
                   <%= tracker.name %><br />
                 <% end %>
-                <% if @project.children.any? %>
+                <% if @project.active_children.any? %>
                 <p><strong><%=l(:label_subproject_plural)%></strong></p>
                 <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
                 <% end %>

app/views/projects/show.rhtml +1 -1

             		<% end %>
             	</div>
-              <% if @subprojects %>
+              <% if @subprojects.any? %>
              	<div class="box">
             		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>
             		<%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %>

lang/bg.yml +2 0

             button_watch: Наблюдавай
             button_unwatch: Спри наблюдението
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: активен
             status_registered: регистриран

lang/de.yml +2 0

             button_watch: Watch
             button_unwatch: Unwatch
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: aktiv
             status_registered: angemeldet

lang/en.yml +2 0

             button_watch: Watch
             button_unwatch: Unwatch
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: active
             status_registered: registered

lang/es.yml +2 0

             button_watch: Watch
             button_unwatch: Unwatch
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: active
             status_registered: registered

lang/fr.yml +2 0

             button_watch: Surveiller
             button_unwatch: Ne plus surveiller
             button_reply: Répondre
+            button_archive: Archiver
+            button_unarchive: Désarchiver
             status_active: actif
             status_registered: enregistré

lang/it.yml +2 0

             button_watch: Watch
             button_unwatch: Unwatch
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: attivo
             status_registered: registrato

lang/ja.yml +2 0

             button_watch: Watch
             button_unwatch: Unwatch
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: 有効
             status_registered: 登録

lang/nl.yml +2 0

             button_watch: Monitor
             button_unwatch: Niet meer monitoren
             button_reply: Antwoord
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: Actief
             status_registered: geregistreerd

lang/pt-br.yml +2 0

             button_watch: Watch
             button_unwatch: Unwatch
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: ativo
             status_registered: registrado

lang/pt.yml +2 0

             button_watch: Observar
             button_unwatch: Não observar
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: ativo
             status_registered: registrado

lang/zh.yml +2 0

             button_watch: Watch
             button_unwatch: Unwatch
             button_reply: Reply
+            button_archive: Archive
+            button_unarchive: Unarchive
             status_active: 激活
             status_registered: 已注册

public/stylesheets/application.css +2 0

             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
+            .icon-lock  { background-image: url(../images/locked.png); }
+            .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }

test/functional/projects_controller_test.rb +16 -1

@@ -1,5 +1,5
1	# redMine - project management software	1	# redMine - project management software
2	# Copyright (C) 2006 Jean-Philippe Lang	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
@@ -125,4 +125,19 class ProjectsControllerTest < Test::Unit::TestCase
125	assert_template 'activity'	125	assert_template 'activity'
126	assert_not_nil assigns(:events_by_day)	126	assert_not_nil assigns(:events_by_day)
127	end	127	end
		128
		129	def test_archive
		130	@request.session[:user_id] = 1 # admin
		131	post :archive, :id => 1
		132	assert_redirected_to 'admin/projects'
		133	assert !Project.find(1).active?
		134	end
		135
		136	def test_unarchive
		137	@request.session[:user_id] = 1 # admin
		138	Project.find(1).archive
		139	post :unarchive, :id => 1
		140	assert_redirected_to 'admin/projects'
		141	assert Project.find(1).active?
		142	end
128	end	143	end

test/unit/project_test.rb +29 -1

@@ -1,5 +1,5
1	# redMine - project management software	1	# redMine - project management software
2	# Copyright (C) 2006 Jean-Philippe Lang	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
@@ -51,6 +51,34 class ProjectTest < Test::Unit::TestCase
51	assert_equal true, public_projects[0].is_public?	51	assert_equal true, public_projects[0].is_public?
52	end	52	end
53		53
		54	def test_archive
		55	user = @ecookbook.members.first.user
		56	@ecookbook.archive
		57	@ecookbook.reload
		58
		59	assert !@ecookbook.active?
		60	assert !user.projects.include?(@ecookbook)
		61	# Subproject are also archived
		62	assert !@ecookbook.children.empty?
		63	assert @ecookbook.active_children.empty?
		64	end
		65
		66	def test_unarchive
		67	user = @ecookbook.members.first.user
		68	@ecookbook.archive
		69	# A subproject of an archived project can not be unarchived
		70	assert !@ecookbook_sub1.unarchive
		71
		72	# Unarchive project
		73	assert @ecookbook.unarchive
		74	@ecookbook.reload
		75	assert @ecookbook.active?
		76	assert user.projects.include?(@ecookbook)
		77	# Subproject can now be unarchived
		78	@ecookbook_sub1.reload
		79	assert @ecookbook_sub1.unarchive
		80	end
		81
54	def test_destroy	82	def test_destroy
55	@ecookbook.destroy	83	@ecookbook.destroy
56	assert_raise(ActiveRecord::RecordNotFound) { Project.find(@ecookbook.id) }	84	assert_raise(ActiveRecord::RecordNotFound) { Project.find(@ecookbook.id) }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages