diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-12-06 01:49:18 +0100 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-12-06 01:49:18 +0100 |
| commit | d71823d3ae883bf66c9a04593dfec920b0f427fb (patch) | |
| tree | e33d076d8e6c4ca4f2e5c04a72b03a89d9f74ace | |
| parent | a633ac77e4768b6daad206fccac3bd7549cbbc55 (diff) | |
added handling of deleted users in journal data
--HG--
branch : beta
| -rw-r--r-- | rhodecode/controllers/journal.py | 3 | ||||
| -rw-r--r-- | rhodecode/public/css/style.css | 9 | ||||
| -rw-r--r-- | rhodecode/templates/journal/journal_data.html | 8 |
3 files changed, 17 insertions, 3 deletions
diff --git a/rhodecode/controllers/journal.py b/rhodecode/controllers/journal.py index 6d04890c..7b34e0c8 100644 --- a/rhodecode/controllers/journal.py +++ b/rhodecode/controllers/journal.py @@ -114,7 +114,8 @@ class JournalController(BaseController): 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)) diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css index b10727db..56800e86 100644 --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -2327,6 +2327,15 @@ a.metatag[tag="license"]:hover { 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;
diff --git a/rhodecode/templates/journal/journal_data.html b/rhodecode/templates/journal/journal_data.html index cbf3240e..213c9c95 100644 --- a/rhodecode/templates/journal/journal_data.html +++ b/rhodecode/templates/journal/journal_data.html @@ -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> |