kallithea Changeset - fee472613dfa

Changeset - fee472613dfa

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 15 years ago 2011-02-26 17:49:52
marcin@python-works.com

made simple global rss and atom feed

5 files changed with 105 insertions and 16 deletions:

rhodecode/config/routing.py

rhodecode/controllers/feed.py

rhodecode/controllers/journal.py

rhodecode/model/db.py

rhodecode/public/css/style.css

0 comments (0 inline, 0 general)

rhodecode/config/routing.py

➞

Show inline comments

@@ @@ -148,8 +148,10 @@ def make_map(config): @@
     #USER JOURNAL
     routes_map.connect('journal', '/_admin/journal', controller='journal',)
     routes_map.connect('public_journal', '/_admin/public_journal', controller='journal',
                        action="public_journal")
     routes_map.connect('public_journal', '/_admin/public_journal', controller='journal', action="public_journal")
     routes_map.connect('public_journal_rss', '/_admin/public_journal_rss', controller='journal', action="public_journal_rss")
     routes_map.connect('public_journal_atom', '/_admin/public_journal_atom', controller='journal', action="public_journal_atom")
     routes_map.connect('toggle_following', '/_admin/toggle_following', controller='journal',
                 action='toggle_following', conditions=dict(method=["POST"]))

rhodecode/controllers/feed.py

➞

Show inline comments

@@ @@ -46,7 +46,7 @@ class FeedController(BaseRepoController) @@
         super(FeedController, self).__before__()
         #common values for feeds
         self.description = _('Changes on %s repository')
-        self.title = "%s feed"
+        self.title = self.title = _('%s %s feed') % (c.rhodecode_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 10

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -32,11 +32,13 @@ from webhelpers.paginate import Page @@
 from itertools import groupby
 from paste.httpexceptions import HTTPInternalServerError
 from pylons import request, tmpl_context as c
 from pylons import request, tmpl_context as c, response, url
 from pylons.i18n.translation import _
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.db import UserLog, UserFollowing
 log = logging.getLogger(__name__)
@@ @@ -47,6 +49,10 @@ class JournalController(BaseController): @@
     @LoginRequired()
     def __before__(self):
         super(JournalController, self).__before__()
         self.title = _('%s public journal %s feed') % (c.rhodecode_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 20
     @NotAnonymous()
     def index(self):
@@ @@ -113,7 +119,7 @@ class JournalController(BaseController): @@
     @NotAnonymous()
     def toggle_following(self):
         cur_token = request.POST.get('auth_token')
         token = get_token()
+        token = h.get_token()
         if cur_token == token:
             user_id = request.POST.get('follows_user_id')
@@ @@ -160,3 +166,79 @@ class JournalController(BaseController): @@
         if request.params.get('partial'):
             return c.journal_data
         return render('journal/public_journal.html')
     def public_journal_atom(self):
         """
         Produce an atom-1.0 feed via feedgenerator module
         """
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == c.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         journal = self._get_journal_data(c.following)
         feed = Atom1Feed(title=self.title % 'atom',
                          link=url('public_journal_atom', qualified=True),
                          description=_('Public journal'),
                          language=self.language,
                          ttl=self.ttl)
         for entry in journal[:self.feed_nr]:
             #tmpl = h.action_parser(entry)[0]
             action, action_extra = h.action_parser(entry, feed=True)
             title = "%s - %s %s" % (entry.user.short_contact, action,
                                  entry.repository.repo_name)
             desc = action_extra()
             feed.add_item(title=title,
                           pubdate=entry.action_date,
                           link=url('', qualified=True),
                           author_email=entry.user.email,
                           author_name=entry.user.full_contact,
                           description=desc)
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
     def public_journal_rss(self):
         """
         Produce an rss2 feed via feedgenerator module
         """
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == c.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         journal = self._get_journal_data(c.following)
         feed = Rss201rev2Feed(title=self.title % 'rss',
                          link=url('public_journal_rss', qualified=True),
                          description=_('Public journal'),
                          language=self.language,
                          ttl=self.ttl)
         for entry in journal[:self.feed_nr]:
             #tmpl = h.action_parser(entry)[0]
             action, action_extra = h.action_parser(entry, feed=True)
             title = "%s - %s %s" % (entry.user.short_contact, action,
                                  entry.repository.repo_name)
             desc = action_extra()
             feed.add_item(title=title,
                           pubdate=entry.action_date,
                           link=url('', qualified=True),
                           author_email=entry.user.email,
                           author_name=entry.user.full_contact,
                           description=desc)
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -98,6 +98,11 @@ class User(Base): @@
         return '%s %s <%s>' % (self.name, self.lastname, self.email)
     @property
     def short_contact(self):
         return '%s %s' % (self.name, self.lastname)
     @property
     def is_admin(self):
         return self.admin

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -605,16 +605,16 @@ padding:0; @@
+}
 #content div.box div.title ul.links li a {
 height:1%;
 display:block;
 float:left;
 border-left:1px solid #316293;
 color:#fff;
 font-size:11px;
 font-weight:700;
 text-decoration:none;
 margin:0;
 padding:13px 16px 12px;
     border-left: 1px solid #316293;
     color: #FFFFFF;
     display: block;
     float: left;
     font-size: 13px;
     font-weight: 700;
     height: 1%;
     margin: 0;
     padding: 11px 22px 12px;
     text-decoration: none;
+}
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6 {

0 comments (0 inline, 0 general)