Project

General

Profile

Feature #465 » veersion_inheritance.patch

Version inheritance patch against 0.7.2.0, first release. Please read comment 13. - Paul Rivier, 2008-06-27 13:55

View differences:

app/controllers/issues_controller.rb Sun Jun 15 14:27:25 2008 +0200 → app/controllers/issues_controller.rb Fri Jun 27 13:12:14 2008 +0200
menu_item :new_issue, :only => :new
before_filter :find_issue, :only => [:show, :edit, :destroy_attachment]
before_filter :check_issue_perms, :only => [:show, :edit]
before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
before_filter :find_project, :only => [:new, :update_form, :preview]
before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
......
helper :journals
helper :projects
include ProjectsHelper
include ProjectsHelper
helper :custom_fields
include CustomFieldsHelper
helper :ifpdf
......
:conditions => @query.statement,
:limit => limit,
:offset => @issue_pages.current.offset
@issues.map!{ |issue| issue_without_hidden_fields(issue) } # don't show forbidden fields
respond_to do |format|
format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
format.atom { render_feed(@issues, :title => l(:label_issue_plural)) }
......
@journals.reverse! if User.current.wants_comments_in_reverse_order?
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
@issue = issue_without_hidden_fields(@issue)
@journals = journals_without_hidden_entries(@journals)
@activities = Enumeration::get_values('ACTI')
@priorities = Enumeration::get_values('IPRI')
@time_entry = TimeEntry.new
......
render_404
end
def issue_fixed_version_allowed?(issue)
((not issue.fixed_version) ||
(User.current.allowed_to?(:view_issues,
issue.fixed_version.project)))
end
def check_issue_perms
@forbidden_fixed_version = (not issue_fixed_version_allowed?(@issue))
end
## Filter journals to remove non allowed entries. This assumes there
## is only 1 parent, so it won't work with more depth. We want here
## to handle the _specific case_ of a user 'Joe' browsing 'Project
## B' issues. 'Project B' is a subproject of 'Project A' and
## inherits its versions. Joe can't see 'Project A, but issue
## fixed_versions has been set at some point to a version belonging
## to 'Project A', by an other member of 'Project B'. Joe should not
## see this sensitive information.
def journals_without_hidden_entries(journals)
unless (journals.empty? || (not @project.parent_id) ||
(@project.parent_id && User.current.allowed_to?(:view_issues, @project.parent)))
journals = journals.dup
# we kill totally the journal entry when some of its elements are forbidden
journals.delete_if do |j|
j.details.map{ |d| (d.property == 'attr' &&
d.prop_key == 'fixed_version_id' &&
((d.old_value &&
(@project.parent_id == Version.find(d.old_value.to_i).project_id)) ||
(d.value &&
(@project.parent_id == Version.find(d.value.to_i).project_id)))
) }.include?(true)
end
end
journals
end
## Filter issue to remove non allowed fields. For more information,
## see documentation of journals_without_hidden_entries
def issue_without_hidden_fields(issue)
unless issue_fixed_version_allowed?(issue)
issue = issue.dup
issue.fixed_version = nil
end
issue
end
# Retrieve query from session or build a new query
def retrieve_query
if !params[:query_id].blank?
app/controllers/projects_controller.rb Sun Jun 15 14:27:25 2008 +0200 → app/controllers/projects_controller.rb Fri Jun 27 13:12:14 2008 +0200
def add_file
if request.post?
@version = @project.versions.find_by_id(params[:version_id])
@version = @project.related_versions.find_by_id(params[:version_id])
attachments = attach_files(@version, params[:attachments])
Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
redirect_to :controller => 'projects', :action => 'list_files', :id => @project
end
@versions = @project.versions.sort
@versions = @project.related_versions.sort
end
def list_files
sort_init "#{Attachment.table_name}.filename", "asc"
sort_update
@versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
@versions = @project.related_versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
render :layout => !request.xhr?
end
......
def changelog
@trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
retrieve_selected_tracker_ids(@trackers)
@versions = @project.versions.sort
@versions = @project.related_versions.sort
end
def roadmap
@trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
retrieve_selected_tracker_ids(@trackers)
@versions = @project.versions.sort
@versions = @versions.select {|v| !v.completed? } unless params[:completed]
# retrieve_related_versions could be integrated right here.
@versions = retrieve_related_versions
end
def activity
......
: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]
) unless @selected_tracker_ids.empty?
events += Version.find(:all, :include => :project,
:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
:conditions => { :effective_date => @calendar.startdt..@calendar.enddt})
end
# add parent versions if relevant
events += @project.related_versions.select{ |v| ((v.project_id == @project.parent_id) &&
v.effective_date) }
@calendar.events = events
render :layout => false if request.xhr?
......
@events += Version.find(:all, :include => :project,
:conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
end
# add parent versions if relevant
@events += @project.related_versions.select{ |v| ((v.project_id == @project.parent_id) &&
v.effective_date) }
@events.sort! {|x,y| x.start_date <=> y.start_date }
if params[:format]=='pdf'
......
render_404
end
def retrieve_related_versions
related_versions=@project.related_versions
# should this test be moved to projects_helper.rb : version_visible_issues ?
params[:completed] ? related_versions : related_versions.select {|v| !v.completed? }
end
def retrieve_selected_tracker_ids(selectable_trackers)
if ids = params[:tracker_ids]
@selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
app/controllers/reports_controller.rb Sun Jun 15 14:27:25 2008 +0200 → app/controllers/reports_controller.rb Fri Jun 27 13:12:14 2008 +0200
render :template => "reports/issue_report_details"
when "version"
@field = "fixed_version_id"
@rows = @project.versions.sort
@rows = @project.related_versions.sort
@data = issues_by_version
@report_title = l(:field_version)
render :template => "reports/issue_report_details"
......
render :template => "reports/issue_report_details"
else
@trackers = @project.trackers
@versions = @project.versions.sort
@versions = @project.related_versions.sort
@priorities = Enumeration::get_values('IPRI')
@categories = @project.issue_categories
@assignees = @project.members.collect { |m| m.user }
app/controllers/versions_controller.rb Sun Jun 15 14:27:25 2008 +0200 → app/controllers/versions_controller.rb Fri Jun 27 13:12:14 2008 +0200
menu_item :roadmap
before_filter :find_project, :authorize
helper :projects
include ProjectsHelper
def show
@issues = version_visible_issues(@version,@project,@project.tracker_ids)
end
def edit
app/helpers/projects_helper.rb Sun Jun 15 14:27:25 2008 +0200 → app/helpers/projects_helper.rb Fri Jun 27 13:12:14 2008 +0200
tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
end
## return an array of the issues attached to version that a user should see
## As a convenience, allow limitation by trackers with Array of tracker_ids
def version_visible_issues(version,project,tracker_ids=[],user=User.current)
# Returns void when user can not see issues or if tracker_ids is void
return [] if ((not user.allowed_to?(:view_issues,
version.project)) or
tracker_ids.empty?)
# user can see project issues, carry on, retrieve them ...
issues = version.
fixed_issues.find(:all,
:include => [:status, :tracker],
:conditions => ["tracker_id in (#{tracker_ids.join(',')})"],
:order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
# Only keep issues from self, parent or children,
related_projects=[project.id].concat(project.child_ids) # project and children
related_projects.push project.parent.id if project.parent # parent if relevant
related_projects = related_projects.select{|x| user.allowed_to?(:view_issues, Project.find(x))}
# now only keep related issues. (issues from brother projects are discarded)
issues.select {|x| related_projects.include?(x.project.id) }
end
# Generates a gantt image
# Only defined if RMagick is avalaible
def gantt_image(events, date_from, months, zoom)
app/models/project.rb Sun Jun 15 14:27:25 2008 +0200 → app/models/project.rb Fri Jun 27 13:12:14 2008 +0200
end
end
## Return versions attached to self, and to parent if relevant.
## Sorting is done in the SQL request to take advantage of cache
def related_versions(user=User.current)
Version.find(:all,
:conditions => {:project_id => if self.parent &&
user.allowed_to?(:view_issues,
self.parent) then
[self.id, self.parent_id]
else [self.id]; end},
:order => "effective_date ASC, name ASC ")
end
protected
def validate
errors.add(parent_id, " must be a root project") if parent and parent.parent
app/models/query.rb Sun Jun 15 14:27:25 2008 +0200 → app/models/query.rb Fri Jun 27 13:12:14 2008 +0200
if project
# project specific filters
@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.related_versions.sort.collect{|s| [s.name, s.id.to_s] } }
unless @project.active_children.empty?
@available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
end
app/views/issues/_form.rhtml Sun Jun 15 14:27:25 2008 +0200 → app/views/issues/_form.rhtml Fri Jun 27 13:12:14 2008 +0200
l(:label_issue_category_new), 'category[name]',
{:controller => 'projects', :action => 'add_issue_category', :id => @project},
:class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
<%= content_tag('p', f.select(:fixed_version_id,
(@project.versions.sort.collect {|v| [v.name, v.id]}),
{ :include_blank => true })) unless @project.versions.empty? %>
<%= unless (@project.related_versions.empty? || @forbidden_fixed_version) then
content_tag('p', f.select(:fixed_version_id,
(@project.related_versions.sort.collect {|v| [v.name, v.id]}),
{ :include_blank => true }))
end %>
</div>
<div class="splitcontentright">
app/views/issues/_form_update.rhtml Sun Jun 15 14:27:25 2008 +0200 → app/views/issues/_form_update.rhtml Fri Jun 27 13:12:14 2008 +0200
</div>
<div class="splitcontentright">
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
<%= content_tag('p', f.select(:fixed_version_id,
(@project.versions.sort.collect {|v| [v.name, v.id]}),
{ :include_blank => true })) unless @project.versions.empty? %>
<%= unless (@issue.fixed_version &&
(not User.current.allowed_to?(:view_issues,
@issue.fixed_version.project)) ||
@project.related_versions.empty?) then
content_tag('p', f.select(:fixed_version_id,
(@project.related_versions.sort.collect {|v| [v.name, v.id]}),
{ :include_blank => true }))
end %>
</div>
app/views/issues/_pdf.rfpdf Sun Jun 15 14:27:25 2008 +0200 → app/views/issues/_pdf.rfpdf Fri Jun 27 13:12:14 2008 +0200
pdf.SetFontStyle('B',9)
pdf.Cell(190,5, l(:label_history), "B")
pdf.Ln
for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
for journal in @journals
pdf.SetFontStyle('B',8)
pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
pdf.Ln
app/views/issues/bulk_edit.rhtml Sun Jun 15 14:27:25 2008 +0200 → app/views/issues/bulk_edit.rhtml Fri Jun 27 13:12:14 2008 +0200
<label><%= l(:field_fixed_version) %>:
<%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_none), :value => 'none') +
options_from_collection_for_select(@project.versions, :id, :name)) %></label>
options_from_collection_for_select(@project.related_versions, :id, :name)) %></label>
</p>
<p>
app/views/projects/roadmap.rhtml Sun Jun 15 14:27:25 2008 +0200 → app/views/projects/roadmap.rhtml Fri Jun 27 13:12:14 2008 +0200
<h2><%=l(:label_roadmap)%></h2>
<% if @versions.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p>
<p class="nodata"><%= l(:label_no_data) %></p>
<% else %>
<div id="roadmap">
<% @versions.each do |version| %>
<%= tag 'a', :name => version.name %>
<h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
<%= render :partial => 'versions/overview', :locals => {:version => version} %>
<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
<% issues = version.fixed_issues.find(:all,
:include => [:status, :tracker],
:conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
:order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty?
issues ||= []
%>
<% if issues.size > 0 %>
<fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
<ul>
<%- issues.each do |issue| -%>
<li class="issue <%= 'closed' if issue.closed? %>"><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
<%- end -%>
</ul>
</fieldset>
<div id="roadmap">
<% @versions.each do |version| %>
<% issues = version_visible_issues(version,@project,@selected_tracker_ids) %>
<% next if (version.project.id != @project.id && issues.empty?) %>
<%= tag 'a', :name => version.name %>
<h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
<%= render :partial => 'versions/overview', :locals => {:version => version} %>
<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
<% if issues.size > 0 %>
<fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
<ul>
<%- issues.each do |issue| -%>
<li class="issue <%= 'closed' if issue.closed? %>">
<%= link_to_issue(issue) %>:
<%=h issue.subject %>
<%= (" <em>(" + issue.project.name + ")</em>") unless issue.project.id == @project.id %>
</li>
<%- end -%>
</ul>
</fieldset>
<% end %>
<% end %>
</div>
<% end %>
<% content_for :sidebar do %>
<% form_tag do %>
<h3><%= l(:label_roadmap) %></h3>
<% @trackers.each do |tracker| %>
<label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
<%= tracker.name %></label><br />
<% end %>
<br />
<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
<% end %>
<% end %>
</div>
<% end %>
<% content_for :sidebar do %>
<% form_tag do %>
<h3><%= l(:label_roadmap) %></h3>
<% @trackers.each do |tracker| %>
<label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
<%= tracker.name %></label><br />
<% end %>
<br />
<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
<% end %>
<h3><%= l(:label_version_plural) %></h3>
<% @versions.each do |version| %>
<%= link_to version.name, "##{version.name}" %><br />
<% end %>
<% end %>
<% html_title(l(:label_roadmap)) %>
<h3><%= l(:label_version_plural) %></h3>
<% @versions.each do |version| %>
<%= link_to version.name, "##{version.name}" %><br />
<% end %>
<% end %>
<% html_title(l(:label_roadmap)) %>
app/views/versions/show.rhtml Sun Jun 15 14:27:25 2008 +0200 → app/views/versions/show.rhtml Fri Jun 27 13:12:14 2008 +0200
<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
<% issues = @version.fixed_issues.find(:all,
:include => [:status, :tracker],
:order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") %>
<% if issues.size > 0 %>
<% if @issues.size > 0 %>
<fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
<ul>
<% issues.each do |issue| -%>
<li class="issue <%= 'closed' if issue.closed? %>"><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
<% @issues.each do |issue| -%>
<li class="issue <%= 'closed' if issue.closed? %>">
<%= link_to_issue(issue) %>: <%=h issue.subject %>
<%= (" <em>(" + issue.project.name + ")</em>") unless issue.project.id == @project.id %>
</li>
<% end -%>
</ul>
</fieldset>
lib/redmine.rb Sun Jun 15 14:27:25 2008 +0200 → lib/redmine.rb Fri Jun 27 13:12:14 2008 +0200
menu.push :overview, { :controller => 'projects', :action => 'show' }
menu.push :activity, { :controller => 'projects', :action => 'activity' }
menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' },
:if => Proc.new { |p| p.versions.any? }
:if => Proc.new { |p| p.related_versions.any? }
menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
:html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
(1-1/4)