Skip to content

Fix issue #8716 by removing from parent before destroy #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix issue #8716 by removing from parent before destroy #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8132466
Fixes issue #8716 by removing from parent before destroy
adufilie Aug 7, 2011
08e4d54
Fixed bug where (:set_issues_private==false && :set_own_issues_privat…
Aug 9, 2011
0f3524e
Trackers with no issues are no longer shown on the overview page. Th…
adufilie Jan 19, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/models/issue.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class Issue < ActiveRecord::Base
before_create :default_assign
before_save :close_duplicates, :update_done_ratio_from_issue_status
after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal
before_destroy :remove_from_parent
after_destroy :update_parent_attributes

# Returns a SQL conditions string used to find all issues visible by the specified user
Expand Down Expand Up @@ -280,7 +281,7 @@ def estimated_hours=(h)
safe_attributes 'is_private',
:if => lambda {|issue, user|
user.allowed_to?(:set_issues_private, issue.project) ||
(issue.author == user && user.allowed_to?(:set_own_issues_private, issue.project))
((issue.author == user || issue.author == nil) && user.allowed_to?(:set_own_issues_private, issue.project))
}

# Safely sets attributes
Expand Down Expand Up @@ -790,6 +791,11 @@ def update_nested_set_attributes
remove_instance_variable(:@parent_issue) if instance_variable_defined?(:@parent_issue)
end

def remove_from_parent
self.parent_issue_id = nil
update_nested_set_attributes
end

def update_parent_attributes
recalculate_attributes_for(parent_id) if parent_id
end
Expand Down
6 changes: 4 additions & 2 deletions app/views/projects/show.rhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@
<h3><%=l(:label_issue_tracking)%></h3>
<ul>
<% for tracker in @trackers %>
<li><%= link_to h(tracker.name), :controller => 'issues', :action => 'index', :project_id => @project,
<% if @total_issues_by_tracker[tracker].to_i > 0 %>
<li><%= link_to h(tracker.name), :controller => 'issues', :action => 'index', :project_id => @project,
:set_filter => 1,
"tracker_id" => tracker.id %>:
<%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
:total => @total_issues_by_tracker[tracker].to_i) %>
</li>
</li>
<% end %>
<% end %>
</ul>
<p>
Expand Down