diff --git a/app/models/next_issue_filter.rb b/app/models/next_issue_filter.rb index 8e51f243..744f99c9 100644 --- a/app/models/next_issue_filter.rb +++ b/app/models/next_issue_filter.rb @@ -5,7 +5,7 @@ class NextIssueFilter def initialize self.users = User.active - self.priorities = Enumeration::get_values('IPRI') + self.priorities = get_priorites self.statuses = IssueStatus.find(:all) end @@ -16,4 +16,14 @@ def each yield group, items end end + + private + # Wrapper around Redmine's API since Enumerations changed in r2472 + def get_priorites + if Enumeration.respond_to?(:priorities) + return Enumeration::priorities + else + return Enumeration::get_values('IPRI') + end + end end diff --git a/spec/controllers/stuff_to_do_controller_spec.rb b/spec/controllers/stuff_to_do_controller_spec.rb index 76f44b30..c459ec4a 100644 --- a/spec/controllers/stuff_to_do_controller_spec.rb +++ b/spec/controllers/stuff_to_do_controller_spec.rb @@ -352,7 +352,7 @@ def post_reorder @priority1 = mock_model(Enumeration) @priority2 = mock_model(Enumeration) priorities = [@priority1, @priority2] - Enumeration.should_receive(:get_values).with('IPRI').and_return(priorities) + Enumeration.should_receive(:priorities).and_return(priorities) filters = controller.send(:filters_for_view) filters.priorities.should include(@priority1)