jro_apps/redmine Commit - r942:3c44aac1f50c

Added version details view accessible from the roadmap....

Jean-Philippe Lang -

r942:3c44aac1f50c

parent child

Context file:

r942:3c44aac1f50c

Expand all files

app/views/versions/_issue_counts.rhtml created 644 +35 0

@@ -0,0 +1,35
	1	<form id="status_by_form">
	2	<fieldset>
	3	<legend>
	4	<%= l(:label_issues_by,
	5	select_tag('status_by',
	6	status_by_options_for_select(criteria),
	7	:id => 'status_by_select',
	8	:onchange => remote_function(:url => { :action => :status_by, :id => version },
	9	:with => "Form.serialize('status_by_form')"))) %>
	10	</legend>
	11	<% if counts.empty? %>
	12	<p><em><%= l(:label_no_data) %></em></p>
	13	<% else %>
	14	<table>
	15	<% counts.each do \|count\| %>
	16	<tr>
	17	<td width="130px" align="right" >
	18	<%= link_to count[:group], {:controller => 'issues',
	19	:action => 'index',
	20	:project_id => version.project,
	21	:set_filter => 1,
	22	:fixed_version_id => version,
	23	"#{criteria}_id" => count[:group]} %>
	24	</td>
	25	<td width="240px">
	26	<%= progress_bar((count[:closed].to_f / count[:total])*100,
	27	:legend => "#{count[:closed]}/#{count[:total]}",
	28	:width => "#{(count[:total].to_f / max * 200).floor}px;") %>
	29	</td>
	30	</tr>
	31	<% end %>
	32	</table>
	33	<% end %>
	34	</fieldset>
	35	</form>

app/views/versions/_overview.rhtml created 644 +24 0

@@ -0,0 +1,24
	1	<% if version.completed? %>
	2	<p><%= format_date(version.effective_date) %></p>
	3	<% elsif version.overdue? %>
	4	<p><strong><%= l(:label_roadmap_overdue, distance_of_time_in_words(Time.now, version.effective_date)) %> (<%= format_date(version.effective_date) %>)</strong></p>
	5	<% elsif version.effective_date %>
	6	<p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
	7	<% end %>
	8
	9	<p><%=h version.description %></p>
	10
	11	<% if version.fixed_issues.count > 0 %>
	12	<%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
	13	<p class="progress-info">
	14	<%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
	15	<%= lwr(:label_closed_issues, version.closed_issues_count) %>
	16	(<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
	17
	18	<%= link_to(version.open_issues_count, :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
	19	<%= lwr(:label_open_issues, version.open_issues_count)%>
	20	(<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
	21	</p>
	22	<% else %>
	23	<p><em><%= l(:label_roadmap_no_issues) %></em></p>
	24	<% end %>

app/views/versions/show.rhtml created 644 +14 0

@@ -0,0 +1,14
	1	<div class="contextual">
	2	<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
	3	</div>
	4
	5	<h2><%= h(@version.name) %></h2>
	6
	7	<div id="status_by" style="float:right;">
	8	<%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
	9	</div>
	10
	11	<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
	12	<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
	13
	14	<% set_html_title h(@version.name) %>

test/functional/versions_controller_test.rb created 644 +42 0

@@ -0,0 +1,42
	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	require 'versions_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class VersionsController; def rescue_action(e) raise e end; end
	23
	24	class VersionsControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :versions, :users, :roles, :members, :enabled_modules
	26
	27	def setup
	28	@controller = VersionsController.new
	29	@request = ActionController::TestRequest.new
	30	@response = ActionController::TestResponse.new
	31	User.current = nil
	32	end
	33
	34	def test_show
	35	get :show, :id => 2
	36	assert_response :success
	37	assert_template 'show'
	38	assert_not_nil assigns(:version)
	39
	40	assert_tag :tag => 'h2', :content => /1.0/
	41	end
	42	end

app/controllers/versions_controller.rb +10 0

               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)
                 flash[:notice] = l(:notice_successful_delete)
                 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

app/helpers/versions_helper.rb +28 0

@@ -16,4 +16,32
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	module VersionsHelper	18	module VersionsHelper
		19
		20	STATUS_BY_CRITERIAS = %w(category tracker priority author assigned_to)
		21
		22	def render_issue_status_by(version, criteria)
		23	criteria \|\|= 'category'
		24	raise 'Unknown criteria' unless STATUS_BY_CRITERIAS.include?(criteria)
		25
		26	h = Hash.new {\|k,v\| k[v] = [0, 0]}
		27	begin
		28	# Total issue count
		29	Issue.count(:group => criteria,
		30	:conditions => ["#{Issue.table_name}.fixed_version_id = ?", version.id]).each {\|c,s\| h[c][0] = s}
		31	# Open issues count
		32	Issue.count(:group => criteria,
		33	:include => :status,
		34	:conditions => ["#{Issue.table_name}.fixed_version_id = ? AND #{IssueStatus.table_name}.is_closed = ?", version.id, false]).each {\|c,s\| h[c][1] = s}
		35	rescue ActiveRecord::RecordNotFound
		36	# When grouping by an association, Rails throws this exception if there's no result (bug)
		37	end
		38	counts = h.keys.compact.sort.collect {\|k\| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
		39	max = counts.collect {\|c\| c[:total]}.max
		40
		41	render :partial => 'issue_counts', :locals => {:version => version, :criteria => criteria, :counts => counts, :max => max}
		42	end
		43
		44	def status_by_options_for_select(value)
		45	options_for_select(STATUS_BY_CRITERIAS.collect {\|criteria\| [l("field_#{criteria}".to_sym), criteria]}, value)
		46	end
19	end	47	end

app/models/issue_category.rb +4 0

                 destroy_without_reassign
               end
+              def <=>(category)
+                name <=> category.name
+              end
               def to_s; name end
             end

app/models/tracker.rb +4 0

               def to_s; name end
+              def <=>(tracker)
+                name <=> tracker.name
+              end
               def self.all
                 find(:all, :order => 'position')
               end

app/views/projects/roadmap.rhtml +24 -42

@@ -5,48 +5,28
5	<% end %>	5	<% end %>
6		6
7	<% @versions.each do \|version\| %>	7	<% @versions.each do \|version\| %>
8	<a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>	8	<%= tag 'a', :name => version.name %>
9	<% if version.completed? %>	9	<h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
10	<p><%= format_date(version.effective_date) %></p>	10	<%= render :partial => 'versions/overview', :locals => {:version => version} %>
11	<% elsif version.overdue? %>	11	<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
12	<p><strong><%= l(:label_roadmap_overdue, distance_of_time_in_words(Time.now, version.effective_date)) %> (<%= format_date(version.effective_date) %>)</strong></p>	12
13	<% elsif version.effective_date %>	13	<% issues = version.fixed_issues.find(:all,
14	<p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>	14	:include => [:status, :tracker],
15	<% end %>	15	:conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
16	<p><%=h version.description %></p>	16	:order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
17		17	issues \|\|= []
18	<% if version.fixed_issues.count > 0 %>	18	%>
19	<%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>	19	<ul>
20	<p class="progress-info">	20	<% if issues.size > 0 %>
21	<%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>	21	<% issues.each do \|issue\| %>
22	<%= lwr(:label_closed_issues, version.closed_issues_count) %>	22	<li>
23	(<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)	23	<%= link = link_to_issue(issue)
24		24	issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
25	<%= link_to(version.open_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>	25	<%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
26	<%= lwr(:label_open_issues, version.open_issues_count)%>	26	</li>
27	(<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)	27	<% end %>
28	</p>	28	<% end %>
29	<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>	29	</ul>
30	<% issues = version.fixed_issues.find(:all,
31	:include => [:status, :tracker],
32	:conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
33	:order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
34	issues \|\|= []
35	%>
36	<ul>
37	<% if issues.size > 0 %>
38	<% issues.each do \|issue\| %>
39	<li>
40	<%= link = link_to_issue(issue)
41	issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
42	<%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
43	</li>
44	<% end %>
45	<% end %>
46	</ul>
47	<% else %>
48	<p><em><%= l(:label_roadmap_no_issues) %></em></p>
49	<% end %>
50	<% end %>	30	<% end %>
51		31
52	<% content_for :sidebar do %>	32	<% content_for :sidebar do %>
@@ -66,3 +46,5
66	<%= link_to version.name, :anchor => version.name %><br />	46	<%= link_to version.name, :anchor => version.name %><br />
67	<% end %>	47	<% end %>
68	<% end %>	48	<% end %>
		49
		50	<% set_html_title l(:label_roadmap) %>

app/views/projects/settings/_versions.rhtml +1 -1

             	<tbody>
             <% for version in @project.versions.sort %>
                 <tr class="<%= cycle 'odd', 'even' %>">
-                <td><%=h version.name %></td>
+                <td><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></td>
                 <td align="center"><%= format_date(version.effective_date) %></td>
                 <td><%=h version.description %></td>
                 <td><%= link_to(version.wiki_page_title, :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>

lang/bg.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/cs.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/de.yml +1 0

             text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/en.yml +1 0

             label_issue_new: New issue
             label_issue_plural: Issues
             label_issue_view_all: View all issues
+            label_issues_by: Issues by %s
             label_document: Document
             label_document_new: New document
             label_document_plural: Documents

lang/es.yml +1 0

             setting_time_format: Formato de hora
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/fr.yml +1 0

             label_issue_new: Nouvelle demande
             label_issue_plural: Demandes
             label_issue_view_all: Voir toutes les demandes
+            label_issues_by: Demandes par %s
             label_document: Document
             label_document_new: Nouveau document
             label_document_plural: Documents

lang/he.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/it.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/ja.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/ko.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/nl.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/pl.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/pt-br.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/pt.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/ro.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/ru.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/sr.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/sv.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lang/zh.yml +1 0

             text_caracters_minimum: Must be at least %d characters long.
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             button_annotate: Annotate
+            label_issues_by: Issues by %s

lib/redmine.rb +1 0

                 # Issues
                 map.permission :view_issues, {:projects => [:changelog, :roadmap],
                                               :issues => [:index, :changes, :show, :context_menu],
+                                              :versions => [:show, :status_by],
                                               :queries => :index,
                                               :reports => :issue_report}, :public => true
                 map.permission :add_issues, {:projects => :add_issue}

public/stylesheets/application.css +2 0

             p.pourcent {font-size: 80%;}
             p.progress-info {clear: left; font-style: italic; font-size: 80%;}
+            div#status_by { margin-left: 16px; margin-bottom: 16px; }
             /***** Tabs *****/
             #content .tabs{height: 2.6em;}
             #content .tabs ul{margin:0;}

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