TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving list specific methods into RedmineBacklogs::List

Browse Source
pull/6827/head
Gregor Schmidt 13 years ago
parent 55dde7923c
commit 100a4213aa
4 changed files with 93 additions and 92 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      app/models/story.rb
  2. 3
      app/models/task.rb
  3. 91
      lib/redmine_backlogs/list.rb
  4. 90
      lib/redmine_backlogs/patches/issue_patch.rb

1
app/models/story.rb
Unescape View File

@ -1,7 +1,6 @@
class Story < Issue
unloadable
include RedmineBacklogs::List
def self.condition(project_id, sprint_id, extras=[])
c = ["project_id = ? AND tracker_id in (?) AND fixed_version_id = ?",

3
app/models/task.rb
Unescape View File

@ -3,8 +3,6 @@ require 'date'
class Task < Issue
unloadable
include RedmineBacklogs::List
def self.tracker
task_tracker = Setting.plugin_redmine_backlogs[:task_tracker]
task_tracker.blank? ? nil : task_tracker.to_i
@ -16,7 +14,6 @@ class Task < Issue
[self.tracker]
end
def self.create_with_relationships(params, project_id)
task = new

91
lib/redmine_backlogs/list.rb
Unescape View File

@ -3,11 +3,40 @@ module RedmineBacklogs::List
def self.included(base)
base.class_eval do
unloadable
acts_as_silent_list
# add new items to top of list automatically
after_create :insert_at, :if => :is_story?
# deactivate the default add_to_list_bottom callback
def add_to_list_bottom
super unless caller(2).first =~ /callbacks/
end
# reorder list, if issue is removed from sprint
before_update :fix_other_issues_positions
before_update :fix_own_issue_position
# Used by acts_as_silent_list to limit the list to a certain subset within
# the table.
# Also sanitize_sql seems to be unavailable in a sensible way. Therefore
# we're using send to circumvent visibility issues.
def scope_condition
self.class.send(:sanitize_sql, ['project_id = ? AND fixed_version_id = ? AND tracker_id IN (?)',
self.project_id, self.fixed_version_id, self.trackers])
end
include InstanceMethods
end
end
module InstanceMethods
def move_after(prev_id)
# remove so the potential 'prev' has a correct position
remove_from_list
@ -33,7 +62,67 @@ module RedmineBacklogs::List
end
end
private
protected
def fix_other_issues_positions
if changes.slice('project_id', 'tracker_id', 'fixed_version_id').present?
if changes.slice('project_id', 'fixed_version_id').blank? and
Story.trackers.include?(tracker_id.to_i) and
Story.trackers.include?(tracker_id_was.to_i)
return
end
if fixed_version_id_changed?
restore_version_id = true
new_version_id = fixed_version_id
self.fixed_version_id = fixed_version_id_was
end
if tracker_id_changed?
restore_tracker_id = true
new_tracker_id = tracker_id
self.tracker_id = tracker_id_was
end
if project_id_changed?
restore_project_id = true
# I've got no idea, why there's a difference between setting the
# project via project= or via project_id=, but there is.
new_project = project
self.project = Project.find(project_id_was)
end
remove_from_list if is_story?
if restore_project_id
self.project = new_project
end
if restore_tracker_id
self.tracker_id = new_tracker_id
end
if restore_version_id
self.fixed_version_id = new_version_id
end
end
end
def fix_own_issue_position
if changes.slice('project_id', 'tracker_id', 'fixed_version_id').present?
if changes.slice('project_id', 'fixed_version_id').blank? and
Story.trackers.include?(tracker_id.to_i) and
Story.trackers.include?(tracker_id_was.to_i)
return
end
if is_story? and fixed_version.present?
insert_at(1)
else
assume_not_in_list
end
end
end
def set_default_prev_positions_silently(prev)
prev.fixed_version.rebuild_positions(prev.project)

90
lib/redmine_backlogs/patches/issue_patch.rb
Unescape View File

@ -5,93 +5,6 @@ module RedmineBacklogs::Patches::IssuePatch
base.class_eval do
unloadable
# The leading and trailing quotes trick the eval code in
# acts_as_silent_list. This way, we are able to execute actual code in
# our quote string. Also sanitize_sql seems to be unavailable in a
# sensible way. Therefore we're using send to circumvent visibility
# issues.
acts_as_silent_list
def scope_condition
self.class.send(:sanitize_sql, ['project_id = ? AND fixed_version_id = ? AND tracker_id IN (?)',
self.project_id, self.fixed_version_id, self.trackers])
end
# add new items to top of list automatically
after_create :insert_at, :if => :is_story?
# reorder list, if issue is removed from sprint
before_update :fix_other_issues_positions
before_update :fix_own_issue_position
# deactivate the default add_to_list_bottom callback
def add_to_list_bottom
super unless caller(2).first =~ /callbacks/
end
def fix_other_issues_positions
if changes.slice('project_id', 'tracker_id', 'fixed_version_id').present?
if changes.slice('project_id', 'fixed_version_id').blank? and
Story.trackers.include?(tracker_id.to_i) and
Story.trackers.include?(tracker_id_was.to_i)
return
end
if fixed_version_id_changed?
restore_version_id = true
new_version_id = fixed_version_id
self.fixed_version_id = fixed_version_id_was
end
if tracker_id_changed?
restore_tracker_id = true
new_tracker_id = tracker_id
self.tracker_id = tracker_id_was
end
if project_id_changed?
restore_project_id = true
# I've got no idea, why there's a difference between setting the
# project via project= or via project_id=, but there is.
new_project = project
self.project = Project.find(project_id_was)
end
remove_from_list if is_story?
if restore_project_id
self.project = new_project
end
if restore_tracker_id
self.tracker_id = new_tracker_id
end
if restore_version_id
self.fixed_version_id = new_version_id
end
end
end
def fix_own_issue_position
if changes.slice('project_id', 'tracker_id', 'fixed_version_id').present?
if changes.slice('project_id', 'fixed_version_id').blank? and
Story.trackers.include?(tracker_id.to_i) and
Story.trackers.include?(tracker_id_was.to_i)
return
end
if is_story? and fixed_version.present?
insert_at(1)
else
assume_not_in_list
end
end
end
# list end
include InstanceMethods
extend ClassMethods
@ -112,6 +25,8 @@ module RedmineBacklogs::Patches::IssuePatch
validate_children(record, attr, value) #not using validates_associated because the errors are not displayed nicely then
end
include RedmineBacklogs::List
end
end
@ -133,6 +48,7 @@ module RedmineBacklogs::Patches::IssuePatch
end
private
def validate_parent_issue_relation(issue, parent_attr, value)
parent = Issue.find_by_id(value)
if parent_issue_relationship_spanning_projects?(parent, issue)

Write Preview
Loading…
Cancel
Save