jro_apps/redmine Commit - r10508:113f8b5cf278

Adds a textual css class for issue priorities (#12216)....

Jean-Philippe Lang -

r10508:113f8b5cf278

parent child

Context file:

r10508:113f8b5cf278

Collapse all files

db/migrate/20121026002032_add_enumerations_position_name.rb created 644 +9 0

			@@ -0,0 +1,9
		1	class AddEnumerationsPositionName < ActiveRecord::Migration
		2	def up
		3	add_column :enumerations, :position_name, :string, :limit => 30
		4	end
		5
		6	def down
		7	remove_column :enumerations, :position_name
		8	end
		9	end

db/migrate/20121026003537_populate_enumerations_position_name.rb created 644 +9 0

			@@ -0,0 +1,9
		1	class PopulateEnumerationsPositionName < ActiveRecord::Migration
		2	def up
		3	IssuePriority.compute_position_names
		4	end
		5
		6	def down
		7	IssuePriority.clear_position_names
		8	end
		9	end

app/models/issue.rb +1 -1

                # Returns a string of css classes that apply to the issue
                def css_classes
-                 s = "issue status-#{status_id} priority-#{priority_id}"
+                 s = "issue status-#{status_id} #{priority.try(:css_classes)}"
                  s << ' closed' if closed?
                  s << ' overdue' if overdue?
                  s << ' child' if child?

app/models/issue_priority.rb +34 0

              class IssuePriority < Enumeration
                has_many :issues, :foreign_key => 'priority_id'
+               after_destroy {|priority| priority.class.compute_position_names}
+               after_save {|priority| priority.class.compute_position_names if priority.position_changed? && priority.position}
                OptionName = :enumeration_issue_priorities
                def option_name
                def transfer_relations(to)
                  issues.update_all("priority_id = #{to.id}")
                end
+               def css_classes
+                 "priority-#{id} priority-#{position_name}"
+               end
+               # Clears position_name for all priorities
+               # Called from migration 20121026003537_populate_enumerations_position_name
+               def self.clear_position_names
+                 update_all :position_name => nil
+               end
+               # Updates position_name for active priorities
+               # Called from migration 20121026003537_populate_enumerations_position_name
+               def self.compute_position_names
+                 priorities = where(:active => true).all.sort_by(&:position)
+                 if priorities.any?
+                   default = priorities.detect(&:is_default?) || priorities[(priorities.size - 1) / 2]
+                   priorities.each_with_index do |priority, index|
+                     name = case
+                       when priority.position == default.position
+                         "default"
+                       when priority.position < default.position
+                         index == 0 ? "lowest" : "low#{index+1}"
+                       else
+                         index == (priorities.size - 1) ? "highest" : "high#{priorities.size - index}"
+                       end
+                     update_all({:position_name => name}, :id => priority.id)
+                   end
+                 end
+               end
              end

test/fixtures/enumerations.yml +5 0

                type: IssuePriority
                active: true
                position: 1
+               position_name: lowest
              enumerations_005:
                name: Normal
                id: 5
                is_default: true
                active: true
                position: 2
+               position_name: default
              enumerations_006:
                name: High
                id: 6
                type: IssuePriority
                active: true
                position: 3
+               position_name: high3
              enumerations_007:
                name: Urgent
                id: 7
                type: IssuePriority
                active: true
                position: 4
+               position_name: high2
              enumerations_008:
                name: Immediate
                id: 8
                type: IssuePriority
                active: true
                position: 5
+               position_name: highest
              enumerations_009:
                name: Design
                id: 9

test/unit/issue_priority_test.rb +30 0

		@@ -73,4 +73,34 class IssuePriorityTest < ActiveSupport::TestCase
73	73	priority.expects(:reset_positions_in_list).once
74	74	priority.move_to = 'higher'
75	75	end
	76
	77	def test_clear_position_names_should_set_position_names_to_nil
	78	IssuePriority.clear_position_names
	79	assert IssuePriority.all.all? {\|priority\| priority.position_name.nil?}
	80	end
	81
	82	def test_compute_position_names_with_default_priority
	83	IssuePriority.clear_position_names
	84
	85	IssuePriority.compute_position_names
	86	assert_equal %w(lowest default high3 high2 highest), IssuePriority.active.all.sort.map(&:position_name)
	87	end
	88
	89	def test_compute_position_names_without_default_priority_should_split_priorities
	90	IssuePriority.clear_position_names
	91	IssuePriority.update_all :is_default => false
	92
	93	IssuePriority.compute_position_names
	94	assert_equal %w(lowest low2 default high2 highest), IssuePriority.active.all.sort.map(&:position_name)
	95	end
	96
	97	def test_adding_a_priority_should_update_position_names
	98	priority = IssuePriority.create!(:name => 'New')
	99	assert_equal %w(lowest default high4 high3 high2 highest), IssuePriority.active.all.sort.map(&:position_name)
	100	end
	101
	102	def test_destroying_a_priority_should_update_position_names
	103	IssuePriority.find_by_position_name('highest').destroy
	104	assert_equal %w(lowest default high2 highest), IssuePriority.active.all.sort.map(&:position_name)
	105	end
76	106	end

test/unit/issue_test.rb +7 0

                def test_journals_after_with_blank_arg_should_return_all_journals
                  assert_equal [Journal.find(1), Journal.find(2)], Issue.find(1).journals_after('')
                end
+               def test_css_classes_should_include_priority
+                 issue = Issue.new(:priority => IssuePriority.find(8))
+                 classes = issue.css_classes.split(' ')
+                 assert_include 'priority-8', classes
+                 assert_include 'priority-highest', classes
+               end
              end

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