jro_apps/redmine Commit - r16:6b08e1b3155e

tracker filter added on change log...

Jean-Philippe Lang -

r16:6b08e1b3155e

parent child

Context file:

r16:6b08e1b3155e

Collapse all files

redmine/app/controllers/projects_controller.rb +13 -4

              # 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 ProjectsController < ApplicationController
                layout 'base'
                before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
                before_filter :require_admin, :only => [ :add, :destroy ]
                helper :sort
                include SortHelper
                helper :search_filter
                include SearchFilterHelper
                helper :custom_fields
                include CustomFieldsHelper
                def index
                  list
                  render :action => 'list'
                end
                # Lists public projects
                def list
                  sort_init 'name', 'asc'
                  sort_update
                  @project_count = Project.count(["is_public=?", true])
                  @project_pages = Paginator.new self, @project_count,
 ,
              								@params['page']
                  @projects = Project.find :all, :order => sort_clause,
              						:conditions => ["is_public=?", true],
              						:limit  =>  @project_pages.items_per_page,
              						:offset =>  @project_pages.current.offset
                end
                # Add a new project
                def add
                  @custom_fields = IssueCustomField.find(:all)
                  @root_projects = Project.find(:all, :conditions => "parent_id is null")
                  @project = Project.new(params[:project])
                  if request.get?
                    @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                  else
                    @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                    @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 @project.save
                      flash[:notice] = l(:notice_successful_create)
                      redirect_to :controller => 'admin', :action => 'projects'
              	  end
                  end
                end
                # Show @project
                def show
                  @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                  @members = @project.members.find(:all, :include => [:user, :role])
                  @subprojects = @project.children if @project.children_count > 0
                  @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
                  @trackers = Tracker.find(:all)
                end
                def settings
                  @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                  @custom_fields = IssueCustomField::find_all
                  @issue_category ||= IssueCategory.new
                  @member ||= @project.members.new
                  @roles = Role.find_all
                  @users = User.find_all - @project.members.find(:all, :include => :user).collect{|m| m.user }
                  @custom_values = ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                end
                # Edit @project
                def edit
                  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).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                      @project.custom_values = @custom_values
                    end
                    if @project.update_attributes(params[:project])
                      flash[:notice] = l(:notice_successful_update)
                      redirect_to :action => 'settings', :id => @project
                    else
                      settings
                      render :action => 'settings'
                    end
                  end
                end
                # Delete @project
                def destroy
                  if request.post? and params[:confirm]
                    @project.destroy
                    redirect_to :controller => 'admin', :action => 'projects'
                  end
                end
                # Add a new issue category to @project
                def add_issue_category
                  if request.post?
                    @issue_category = @project.issue_categories.build(params[:issue_category])
                    if @issue_category.save
                      flash[:notice] = l(:notice_successful_create)
                      redirect_to :action => 'settings', :id => @project
                    else
                      settings
                      render :action => 'settings'
                    end
                  end
                end
                # Add a new version to @project
                def add_version
                	@version = @project.versions.build(params[:version])
                	if request.post? and @version.save
                	  flash[:notice] = l(:notice_successful_create)
                    redirect_to :action => 'settings', :id => @project
                	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', :id => @project
                    else
                      settings
                      render :action => 'settings'
                    end
                  end
                end
                # Show members list of @project
                def list_members
                  @members = @project.members
                end
                # Add a new document to @project
                def add_document
                  @categories = Enumeration::get_values('DCAT')
                  @document = @project.documents.build(params[:document])
                  if request.post?
                    # Save the attachment
                    if params[:attachment][:file].size > 0
                      @attachment = @document.attachments.build(params[:attachment])
                      @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                    end
                    if @document.save
                      flash[:notice] = l(:notice_successful_create)
                      redirect_to :action => 'list_documents', :id => @project
                    end
                  end
                end
                # Show documents list of @project
                def list_documents
                  @documents = @project.documents
                end
                # Add a new issue to @project
                def add_issue
                  @tracker = Tracker.find(params[:tracker_id])
                  @priorities = Enumeration::get_values('IPRI')
                  @issue = Issue.new(:project => @project, :tracker => @tracker)
                  if request.get?
                    @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                  else
                    @issue.attributes = params[:issue]
                    @issue.author_id = self.logged_in_user.id if self.logged_in_user
                    # Create the document if a file was sent
                    if params[:attachment][:file].size > 0
                      @attachment = @issue.attachments.build(params[:attachment])
                      @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                    end
                    @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
                      flash[:notice] = l(:notice_successful_create)
                      Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                      redirect_to :action => 'list_issues', :id => @project
                    end
                  end
                end
                # Show filtered/sorted issues list of @project
                def list_issues
                  sort_init 'issues.id', 'desc'
                  sort_update
                  search_filter_init_list_issues
                  search_filter_update if params[:set_filter] or request.post?
                  @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
                  @issue_pages = Paginator.new self, @issue_count, 15, @params['page']
                  @issues = Issue.find :all, :order => sort_clause,
              						:include => [ :author, :status, :tracker, :project ],
              						:conditions => search_filter_clause,
              						:limit  =>  @issue_pages.items_per_page,
              						:offset =>  @issue_pages.current.offset
                end
                # Export filtered/sorted issues list to CSV
                def export_issues_csv
                  sort_init 'issues.id', 'desc'
                  sort_update
                  search_filter_init_list_issues
                  @issues =  Issue.find :all, :order => sort_clause,
              						:include => [ :author, :status, :tracker, :project ],
              						:conditions => search_filter_clause
                  export = StringIO.new
                  CSV::Writer.generate(export, ',') do |csv|
                    csv << %w(Id Status Tracker Subject Author Created Updated)
                    @issues.each do |issue|
                      csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, l_datetime(issue.created_on),  l_datetime(issue.updated_on)]
                    end
                  end
                  export.rewind
                  send_data(export.read,
                    :type => 'text/csv; charset=utf-8; header=present',
                    :filename => 'export.csv')
                end
                # Add a news to @project
                def add_news
                  @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)
                      redirect_to :action => 'list_news', :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"
                end
                def add_file
                  if request.post?
                    # Save the attachment
                    if params[:attachment][:file].size > 0
                      @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                      @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                      if @attachment.save
                        flash[:notice] = l(:notice_successful_create)
                        redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                      end
                    end
                  end
                  @versions = @project.versions
                end
                def list_files
                  @versions = @project.versions
                end
-               # Show changelog of @project
+               # Show changelog for @project
                def changelog
+                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true])
+                 if request.get?
+                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
+                 else
+                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
+                 end
+                 @selected_tracker_ids ||= []
                  @fixed_issues = @project.issues.find(:all,
-                                                    :include => [ :fixed_version, :status, :tracker ],
-                                                    :conditions => [ "issue_statuses.is_closed=? and trackers.is_in_chlog=? and issues.fixed_version_id is not null", true, true]
+                                                   )
+                   :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
              private
                # Find project of id params[:id]
                # if not found, redirect to project list
-               # used as a before_filter
+               # Used as a before_filter
                def find_project
                  @project = Project.find(params[:id])
                rescue
                  redirect_to :action => 'list'
                end
              end

redmine/app/views/projects/changelog.rhtml +21 -8

		@@ -1,12 +1,25
1	1	<h2><%=l(:label_change_log)%></h2>
2	2
3		<% fixed_issues = @fixed_issues.group_by {\|i\| i.fixed_version } %>
4		<% fixed_issues.each do \|version, issues\| %>
5		<p><strong><%= version.name %></strong> - <%= format_date(version.effective_date) %><br />
6		<%=h version.description %></p>
7		<ul>
8		<% issues.each do \|i\| %>
9		<li><%= link_to i.long_id, :controller => 'issues', :action => 'show', :id => i %> [<%= i.tracker.name %>]: <%= i.subject %></li>
	3
	4	<%= start_form_tag %>
	5	<% @trackers.each do \|tracker\| %>
	6	<%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
	7	<%= tracker.name %>
10	8	<% end %>
11		</ul>
	9	<%= submit_tag l(:button_apply), :class => 'button-small' %>
	10	<%= end_form_tag %>
	11
	12	<p> </p>
	13
	14	<% ver_id = nil
	15	@fixed_issues.each do \|issue\| %>
	16	<% unless ver_id == issue.fixed_version_id %>
	17	<% if ver_id %></ul><% end %>
	18	<p><strong><%= issue.fixed_version.name %></strong> - <%= format_date(issue.fixed_version.effective_date) %><br />
	19	<%=h issue.fixed_version.description %></p>
	20	<ul>
	21	<% ver_id = issue.fixed_version_id
	22	end %>
	23	<li><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %> [<%= issue.tracker.name %>]: <%= issue.subject %></li>
12	24	<% end %>
	25

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