kallithea Changeset - 0f22dedb588f

Changeset - 0f22dedb588f

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2012-01-13 20:31:01
marcin@python-works.com

added short_id to feeds, and made it more compact

1 file changed with 19 insertions and 8 deletions:

rhodecode/controllers/feed.py

0 comments (0 inline, 0 general)

rhodecode/controllers/feed.py

➞

Show inline comments

@@ @@ -42,75 +42,86 @@ class FeedController(BaseRepoController) @@
     @LoginRequired(api_access=True)
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(FeedController, self).__before__()
         #common values for feeds
         self.description = _('Changes on %s repository')
         self.title = self.title = _('%s %s feed') % (c.rhodecode_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 10
     def _get_title(self, cs):
         return "R%s:%s - %s" % (
             cs.revision, cs.short_id, cs.message
+        )
     def __changes(self, cs):
         changes = []
         a = [safe_unicode(n.path) for n in cs.added]
         if a:
             changes.append('\nA ' + '\nA '.join(a))
         m = [safe_unicode(n.path) for n in cs.changed]
         if m:
             changes.append('\nM ' + '\nM '.join(m))
         d = [safe_unicode(n.path) for n in cs.removed]
         if d:
             changes.append('\nD ' + '\nD '.join(d))
         changes.append('</pre>')
         return ''.join(changes)
     def atom(self, repo_name):
         """Produce an atom-1.0 feed via feedgenerator module"""
         feed = Atom1Feed(title=self.title % repo_name,
         feed = Atom1Feed(
              title=self.title % repo_name,
                          link=url('summary_home', repo_name=repo_name,
                                   qualified=True),
                          description=self.description % repo_name,
                          language=self.language,
                          ttl=self.ttl)
              ttl=self.ttl
+        )
         for cs in reversed(list(c.rhodecode_repo[-self.feed_nr:])):
         desc_msg = []
         for cs in reversed(list(c.rhodecode_repo[-self.feed_nr:])):
             desc_msg.append('%s - %s<br/><pre>' % (cs.author, cs.date))
             desc_msg.append(self.__changes(cs))
-            feed.add_item(title=cs.message,
+            feed.add_item(title=self._get_title(cs),
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
                           author_name=cs.author,
                           description=''.join(desc_msg))
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
     def rss(self, repo_name):
         """Produce an rss2 feed via feedgenerator module"""
         feed = Rss201rev2Feed(title=self.title % repo_name,
         feed = Rss201rev2Feed(
             title=self.title % repo_name,
                          link=url('summary_home', repo_name=repo_name,
                                   qualified=True),
                          description=self.description % repo_name,
                          language=self.language,
                          ttl=self.ttl)
             ttl=self.ttl
+        )
         for cs in reversed(list(c.rhodecode_repo[-self.feed_nr:])):
         desc_msg = []
         for cs in reversed(list(c.rhodecode_repo[-self.feed_nr:])):
             desc_msg.append('%s - %s<br/><pre>' % (cs.author, cs.date))
             desc_msg.append(self.__changes(cs))
-            feed.add_item(title=cs.message,
+            feed.add_item(title=self._get_title(cs),
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
                           author_name=cs.author,
                           description=''.join(desc_msg),
+                         )
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')

0 comments (0 inline, 0 general)