Commit: 9e5ba02e8aafb862fb68ce13ce0512cd5999948a - allura (git)

allura

Commit MetaInfo

• Revision: 9e5ba02e8aafb862fb68ce13ce0512cd5999948a (tree)
• Zeit: 2012-04-19 06:44:28
• Autor: Tim Van Steenburgh <tvansteenburgh@geek...>
• Commiter: Jenny Steele

Log Message

[#4014] Tracker not sending notification mail.

1. Fixes a 500 in tracker notifications if project-level

notifications are disabled.

2. To accomodate migrated projects that may not have the default

_milestone field, the Edit Miletones page will now create it
on-the-fly if necessary.

Signed-off-by: Tim Van Steenburgh <[e-mail]>

Ändern Zusammenfassung

• modified: ForgeTracker/forgetracker/model/ticket.py
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py
• modified: ForgeTracker/forgetracker/tracker_main.py

Diff

--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -407,7 +407,7 @@ class Ticket(VersionedArtifact):
             Thread(discussion_id=self.app_config.discussion_id,
                    ref_id=self.index_id())
             n = Notification.post(artifact=self, topic='metadata', text=description, subject=subject)
-            if monitoring_email:
+            if monitoring_email and n:
                 n.send_simple(monitoring_email)
         Feed.post(self, description)
 

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -45,6 +45,22 @@ class TestMilestones(TrackerTestController):
         r = self.app.get('/bugs/milestones')
         assert '1 / 2' in r, r.showbrowser()
 
+    def test_default_milestone_created_if_missing(self):
+        p = M.Project.query.get(shortname='test')
+        app = p.app_instance('bugs')
+        app.globals.custom_fields = []
+        ThreadLocalORMSession.flush_all()
+        r = self.app.post('/bugs/update_milestones',{
+            'field_name':'_milestone',
+            'milestones-0.old_name':'',
+            'milestones-0.new_name':'1.0',
+            'milestones-0.description':'Version 1',
+            'milestones-0.complete':'Open',
+            'milestones-0.due_date':''
+        })
+        r = self.app.get('/bugs/milestones')
+        assert 'Version 1' in r
+
 class TestFunctionalController(TrackerTestController):
     def test_bad_ticket_number(self):
         self.app.get('/bugs/input.project_user_select', status=404)
@@ -912,6 +928,18 @@ class TestEmailMonitoring(TrackerTestController):
         assert send_simple.call_count == 1, send_simple.call_count
         send_simple.assert_called_with(self.test_email)
 
+    @patch('forgetracker.tracker_main.M.Notification.send_simple')
+    def test_notifications_off(self, send_simple):
+        """Test that tracker notification email is not sent if notifications
+        are disabled at the project level.
+        """
+        p = M.Project.query.get(shortname='test')
+        p.notifications_disabled = True
+        ThreadLocalORMSession.flush_all()
+        self._set_options()
+        self.new_ticket(summary='test')
+        assert send_simple.call_count == 0, send_simple.call_count
+
 class TestCustomUserField(TrackerTestController):
     def setUp(self):
         super(TestCustomUserField, self).setUp()

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -441,6 +441,14 @@ class RootController(BaseController):
     def update_milestones(self, field_name=None, milestones=None, **kw):
         require_access(c.app, 'configure')
         update_counts = False
+        # If the default milestone field doesn't exist, create it.
+        # TODO: This is a temporary fix for migrated projects, until we make
+        # the Edit Milestones page capable of editing any/all milestone fields
+        # instead of just the default "_milestone" field.
+        if field_name == '_milestone' and \
+            field_name not in c.app.globals.milestone_fields:
+            c.app.globals.custom_fields.append(dict(name='_milestone',
+                label='Milestone', type='milestone', milestones=[]))
         for fld in c.app.globals.milestone_fields:
             if fld.name == field_name:
                 for new in milestones: