コミット: b8e16105e119988011f5ae3638eaf803e882cb0e - allura (git)

allura

コミットメタ情報

• リビジョン: b8e16105e119988011f5ae3638eaf803e882cb0e (tree)
• 日時: 2012-05-30 01:00:12
• 作者: bolkimen <bolkimen@yaho...>
• コミッター: Dave Brondsema

ログメッセージ

[#3775] ticket:70 update commit messages

変更サマリ

• modified: Allura/allura/model/notification.py
• modified: Allura/allura/model/repo_refresh.py
• modified: Allura/allura/model/repository.py
• modified: Allura/allura/tests/model/test_repo.py

差分

--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -149,6 +149,7 @@ class Notification(MappedClass):
                 from_address=reply_to,
                 reply_to_address=reply_to,
                 subject=subject_prefix + subject,
+                text=kwargs.pop('text', subject),
                 author_id=c.user._id,
                 pubdate=datetime.utcnow())
             if c.user.get_pref('email_address'):
@@ -159,19 +160,6 @@ class Notification(MappedClass):
                 d['from_address'] = '"%s" <%s>' % (
                     c.user.get_pref('display_name'),
                     c.user.email_addresses[0])
-
-            email_format = 'plain'
-            if c.user.get_pref('email_format'):
-                email_format = c.user.get_pref('email_format')
-            email_text = kwargs.pop('text', subject)
-            if email_format == 'plain':
-                # Here we render text message
-                d['text'] = email_text
-            else:
-                # For html or both we render html text
-                md = g.forge_markdown(email=True)
-                d['text'] = md.convert(email_text)
-
         if not d.get('text'):
             d['text'] = ''
         try:

--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -327,7 +327,7 @@ def send_notifications(repo, commit_ids):
                 author_link=ci.author_url,
                 author_name=ci.authored.name)
             branches = repo.symbolics_for_commit(ci.legacy)[0]
-            commit_msgs.append('[%s] %s by %s %s%s' % (
+            commit_msgs.append('%s: %s by %s %s%s' % (
                     ",".join(b for b in branches),
                     summary, ci.authored.name, base_url, ci.url()))
     if commit_msgs:
@@ -341,7 +341,11 @@ def send_notifications(repo, commit_ids):
                 repo.app.project.name,
                 repo.app.config.options.mount_label,
                 summary)
-            text = ci.message
+            branches = repo.symbolics_for_commit(ci.legacy)[0]
+            text = "%s: %s %s%s" % (",".join(b for b in branches),
+                               ci.message,
+                               base_url, ci.url())
+
         Notification.post(
             artifact=repo,
             topic='metadata',

--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -359,7 +359,7 @@ class Repository(Artifact):
                     author_name = ci.authored.name,
                 )
                 branches = ci.symbolic_ids[0]
-                commit_msgs.append('[%s] %s by %s %s%s' % (
+                commit_msgs.append('%s: %s by %s %s%s' % (
                         ",".join(b for b in branches),
                         h.really_unicode(ci.summary), h.really_unicode(ci.committed.name), base_url, ci.url()))
         if commit_msgs:
@@ -373,7 +373,13 @@ class Repository(Artifact):
                     self.app.project.name,
                     self.app.config.options.mount_label,
                     h.really_unicode(ci.summary))
-                text = h.really_unicode(ci.message)
+                ci.set_context(self)
+                branches = ci.symbolic_ids[0]
+                message = "%s: %s %s%s" % (",".join(b for b in branches),
+                                           ci.message,
+                                           base_url, ci.url())
+                text = h.really_unicode(message)
+                log.info("SUBJ: %s MESSAGE: %s" % (subject, text))
             Notification.post(
                 artifact=self,
                 topic='metadata',

--- a/Allura/allura/tests/model/test_repo.py
+++ b/Allura/allura/tests/model/test_repo.py
@@ -169,7 +169,7 @@ class TestRepo(_TestWithRepo):
         notifications = M.Notification.query.find().all()
         for n in notifications:
             if '100 new commits' in n.subject:
-                assert "[master,branch]  by Test Committer http://localhost/#" in n.text
+                assert "master,branch:  by Test Committer http://localhost/#" in n.text
                 break
         else:
             assert False, 'Did not find notification'