jro_apps/redmine Commit - r11284:5bb2f5e211b7

Merged r11509 and r11512 from trunk (#13309)....

Jean-Philippe Lang -

r11284:5bb2f5e211b7

parent child

Context file:

r11284:5bb2f5e211b7

Collapse all files

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.try(:css_classes)}"
+                s = "issue tracker-#{tracker_id} status-#{status_id} #{priority.try(:css_classes)}"
                 s << ' closed' if closed?
                 s << ' overdue' if overdue?
                 s << ' child' if child?

test/unit/helpers/application_helper_test.rb +3 -3

               def test_redmine_links
                 issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3},
-                                           :class => 'issue status-1 priority-4 priority-lowest overdue', :title => 'Error 281 when updating a recipe (New)')
+                                           :class => Issue.find(3).css_classes, :title => 'Error 281 when updating a recipe (New)')
                 note_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3, :anchor => 'note-14'},
-                                           :class => 'issue status-1 priority-4 priority-lowest overdue', :title => 'Error 281 when updating a recipe (New)')
+                                           :class => Issue.find(3).css_classes, :title => 'Error 281 when updating a recipe (New)')
                 changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                                :class => 'changeset', :title => 'My very first commit')
                 expected = <<-EXPECTED
             <p><a href="/projects/ecookbook/wiki/CookBook_documentation" class="wiki-page">CookBook documentation</a></p>
-            <p><a href="/issues/1" class="issue status-1 priority-4 priority-lowest" title="Can&#x27;t print recipes (New)">#1</a></p>
+            <p><a href="/issues/1" class="#{Issue.find(1).css_classes}" title="Can&#x27;t print recipes (New)">#1</a></p>
             <pre>
             [[CookBook documentation]]

test/unit/issue_test.rb +6 0

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

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