Mercurial > kallithea
changeset 3068:44827c84dc66 beta
added handling of deleted users in journal data
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 06 Dec 2012 01:49:18 +0100 |
| parents | 9b0636e9b16b |
| children | 9dca99ffd495 |
| files | rhodecode/controllers/journal.py rhodecode/public/css/style.css rhodecode/templates/journal/journal_data.html |
| diffstat | 3 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/journal.py Thu Dec 06 01:34:45 2012 +0100 +++ b/rhodecode/controllers/journal.py Thu Dec 06 01:49:18 2012 +0100 @@ -114,7 +114,8 @@ groups = [] 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): + #groupby username if it's a present value, else fallback to journal username + for _, g2 in groupby(list(g), lambda x: x.user.username if x.user else x.username): l = list(g2) user_group.append((l[0].user, l))
--- a/rhodecode/public/css/style.css Thu Dec 06 01:34:45 2012 +0100 +++ b/rhodecode/public/css/style.css Thu Dec 06 01:49:18 2012 +0100 @@ -2327,6 +2327,15 @@ height: 30px; } +#journal .journal_user.deleted { + color: #747474; + font-size: 14px; + font-weight: normal; + height: 30px; + font-style: italic; +} + + #journal .journal_icon { clear: both; float: left;
--- a/rhodecode/templates/journal/journal_data.html Thu Dec 06 01:34:45 2012 +0100 +++ b/rhodecode/templates/journal/journal_data.html Thu Dec 06 01:49:18 2012 +0100 @@ -6,9 +6,13 @@ % for user,entries in items: <div class="journal_container"> <div class="gravatar"> - <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> + <img alt="gravatar" src="${h.gravatar_url(user.email if user else 'anonymous@rhodecode.org',24)}"/> </div> - <div class="journal_user">${user.name} ${user.lastname}</div> + %if user: + <div class="journal_user">${user.name} ${user.lastname}</div> + %else: + <div class="journal_user deleted">${entries[0].username}</div> + %endif <div class="journal_action_container"> % for entry in entries: <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>