diff --git a/rhodecode/controllers/journal.py b/rhodecode/controllers/journal.py --- a/rhodecode/controllers/journal.py +++ b/rhodecode/controllers/journal.py @@ -41,10 +41,9 @@ from rhodecode.model.db import UserLog, log = logging.getLogger(__name__) + class JournalController(BaseController): - - def __before__(self): super(JournalController, self).__before__() self.rhodecode_user = self.rhodecode_user @@ -75,12 +74,11 @@ class JournalController(BaseController): return c.journal_data return render('journal/journal.html') - def _get_daily_aggregate(self, journal): groups = [] - for k, g in groupby(journal, lambda x:x.action_as_day): + for k, g in groupby(journal, lambda x: x.action_as_day): user_group = [] - for k2, g2 in groupby(list(g), lambda x:x.user.email): + for k2, g2 in groupby(list(g), lambda x: x.user.email): l = list(g2) user_group.append((l[0].user, l)) @@ -88,7 +86,6 @@ class JournalController(BaseController): return groups - def _get_journal_data(self, following_repos): repo_ids = [x.follows_repository.repo_id for x in following_repos if x.follows_repository is not None] @@ -113,7 +110,6 @@ class JournalController(BaseController): else: journal = [] - return journal @LoginRequired() @@ -127,7 +123,7 @@ class JournalController(BaseController): if user_id: try: self.scm_model.toggle_following_user(user_id, - self.rhodecode_user.user_id) + self.rhodecode_user.user_id) return 'ok' except: raise HTTPBadRequest() @@ -136,17 +132,14 @@ class JournalController(BaseController): if repo_id: try: self.scm_model.toggle_following_repo(repo_id, - self.rhodecode_user.user_id) + self.rhodecode_user.user_id) return 'ok' except: raise HTTPBadRequest() - log.debug('token mismatch %s vs %s', cur_token, token) raise HTTPBadRequest() - - @LoginRequired() def public_journal(self): # Return a rendered template @@ -168,7 +161,6 @@ class JournalController(BaseController): return c.journal_data return render('journal/public_journal.html') - @LoginRequired(api_access=True) def public_journal_atom(self): """