Merge lp:~jkakar/kanban/include-needs-testing-bugfixes into lp:kanban

[Jamu Kakar]

This branch introduces the following changes:

- Malformed content in the HTML template has been fixed.

- The 'include_needs_testing' state is passed to Story classes, which
  fixes problems with rendering cards in the wrong column when 'Needs
  testing' is enabled.

[lp:~jkakar/kanban/include-needs-testing-bugfixes]

29. By Jamu Kakar on 2011-04-02

- The 'Ubuntu' font is the default and 'UbuntuBeta' has been removed.

[Martin Pool (mbp)]

review: Approve

=== modified file 'kanban/board.py'
--- kanban/board.py	2011-03-29 13:59:45 +0000
+++ kanban/board.py	2011-04-02 09:38:29 +0000
@@ -133,7 +133,7 @@
         to use the 'Needs testing' category.  Defaults to C{False}.
     """
 
-    def __init__(self, name, include_needs_testing=False):
+    def __init__(self, name, include_needs_testing=None):
         self.name = name
         self.include_needs_testing = include_needs_testing
         self.bugs = []
@@ -208,12 +208,14 @@
                 if story:
                     stories.append(story)
                 else:
-                    story = Story(name)
+                    story = Story(
+                        name, include_needs_testing=self.include_needs_testing)
                     self._stories[name] = story
                     stories.append(story)
         else:
             if None not in self._stories:
-                self._stories[None] = Story(None)
+                self._stories[None] = Story(
+                    None, include_needs_testing=self.include_needs_testing)
             stories.append(self._stories[None])
 
         return stories
 
=== modified file 'kanban/templates/kanban.html'
--- kanban/templates/kanban.html	2011-03-15 07:37:00 +0000
+++ kanban/templates/kanban.html	2011-04-02 09:38:29 +0000
@@ -47,15 +47,18 @@
 
     {% for story in kanban_board.stories %}
       {% if kanban_board.stories|length > 1 %}
-        <div class="tiles row story">
-	  {% if story.name %}
-	    <div class="position-0 {{ board_width_class }} cell">{{ story.name }}</div>
-	  {% else %}
-	    <div class="position-0 {{ board_width_class }} cell">uncategorized</div>
-	  {% endif %}
-      {% else %}
+	    {% if story.name %}
+        <div class="tiles row story">
+          <div class="position-0 {{ board_width_class }} cell">{{ story.name }}</div>
+        </div>
+	    {% else %}
+        <div class="tiles row story">
+	      <div class="position-0 {{ board_width_class }} cell">uncategorized</div>
+        </div>
+	    {% endif %}
+        {% else %}
         <div class="tiles row no-story"></div>
-      {% endif %}
+        {% endif %}
 
       <div class="tiles row">
         <div class="position-0 width-2 cell">
 
=== modified file 'kanban/tests/test_board.py'
--- kanban/tests/test_board.py	2011-03-29 13:59:45 +0000
+++ kanban/tests/test_board.py	2011-04-02 09:38:29 +0000
@@ -480,6 +480,21 @@
         self.assertEqual(["story-test1", "story-test2", None],
                          [story.name for story in kanban_board.stories])
 
+    def test_add_considers_include_needs_testing(self):
+        """
+        If a L{Bug} with a C{story-<name>} tag is added to a
+        L{StoryCollectionMixin} which is configured to include the 'Needs
+        testing' category, the related L{Story}s will also be configured to
+        include the 'Needs testing' category.
+        """
+        bug = Bug("1", "kanban", MEDIUM, NEW, "A title", tags=["story-test"])
+        kanban_board = self.create_test_class(include_needs_testing=True)
+        kanban_board.add(bug)
+        self.assertEqual([bug], kanban_board.bugs)
+        self.assertEqual(1, len(kanban_board.stories))
+        story = kanban_board.stories[0]
+        self.assertTrue(story.include_needs_testing)
+
 
 class MilestoneBoardTest(BugCollectionMixinTestBase,
                          StoryCollectionMixinTestBase, TestCase):
 
=== modified file 'media/kanban.css'
--- media/kanban.css	2011-03-12 22:07:32 +0000
+++ media/kanban.css	2011-04-02 09:38:29 +0000
@@ -1,7 +1,7 @@
 body {
     background: url(background.png) repeat;
     color: #222222;
-    font-family: "UbuntuBeta", Ubuntu, "Bitstream Vera Sans", "DejaVu Sans", Tahoma, sans-serif;
+    font-family: Ubuntu, "Bitstream Vera Sans", "DejaVu Sans", Tahoma, sans-serif;
     font-size: 12px;
 }