meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-23 17:01:13 +00:00
Code Issues Releases Wiki Activity

use "do end" instead of {} at app/models/issue.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20284 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-11-07 12:30:38 +00:00
parent 238e6ce65d
commit 63cd0b3e61
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/issue.rb
View File

@ -485,16 +485,16 @@ class Issue < ActiveRecord::Base
:if => lambda {|issue, user| issue.new_record? && user.allowed_to?(:add_issue_watchers, issue.project)}) :if => lambda {|issue, user| issue.new_record? && user.allowed_to?(:add_issue_watchers, issue.project)})
safe_attributes( safe_attributes(
'is_private', 'is_private',
:if => lambda {|issue, user| :if => lambda do |issue, user|
user.allowed_to?(:set_issues_private, issue.project) || user.allowed_to?(:set_issues_private, issue.project) ||
(issue.author_id == user.id && user.allowed_to?(:set_own_issues_private, issue.project)) (issue.author_id == user.id && user.allowed_to?(:set_own_issues_private, issue.project))
}) end)
safe_attributes( safe_attributes(
'parent_issue_id', 'parent_issue_id',
:if => lambda {|issue, user| :if => lambda do |issue, user|
(issue.new_record? || issue.attributes_editable?(user)) && (issue.new_record? || issue.attributes_editable?(user)) &&
user.allowed_to?(:manage_subtasks, issue.project) user.allowed_to?(:manage_subtasks, issue.project)
}) end)
safe_attributes( safe_attributes(
'deleted_attachment_ids', 'deleted_attachment_ids',
:if => lambda {|issue, user| issue.attachments_deletable?(user)}) :if => lambda {|issue, user| issue.attachments_deletable?(user)})
@ -1263,11 +1263,11 @@ class Issue < ActiveRecord::Base
all = [self] all = [self]
last = [self] last = [self]
while last.any? while last.any?
current = last.map {|i| current = last.map do |i|
i.relations_from.where(:relation_type => IssueRelation::TYPE_PRECEDES).map(&:issue_to) + i.relations_from.where(:relation_type => IssueRelation::TYPE_PRECEDES).map(&:issue_to) +
i.leaves.to_a + i.leaves.to_a +
i.ancestors.map {|a| a.relations_from.where(:relation_type => IssueRelation::TYPE_PRECEDES).map(&:issue_to)} i.ancestors.map {|a| a.relations_from.where(:relation_type => IssueRelation::TYPE_PRECEDES).map(&:issue_to)}
}.flatten.uniq end.flatten.uniq
current -= last current -= last
current -= all current -= all
return true if current.include?(other) return true if current.include?(other)
@ -1747,12 +1747,12 @@ class Issue < ActiveRecord::Base
else else
average = 1.0.to_d average = 1.0.to_d
end end
done = children.map {|c| done = children.map do |c|
estimated = (c.total_estimated_hours || 0.0).to_d estimated = (c.total_estimated_hours || 0.0).to_d
estimated = average unless estimated > 0.0 estimated = average unless estimated > 0.0
ratio = c.closed? ? 100 : (c.done_ratio || 0) ratio = c.closed? ? 100 : (c.done_ratio || 0)
estimated * ratio estimated * ratio
}.sum end.sum
progress = done / (average * children.count) progress = done / (average * children.count)
p.done_ratio = progress.floor p.done_ratio = progress.floor
end end