# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1354754958 -3600
# Node ID 44827c84dc6624eac885642a034a4c979d15a92f
# Parent  9b0636e9b16b97e29f07179731ba1666267feecc
added handling of deleted users in journal data

diff -r 9b0636e9b16b -r 44827c84dc66 rhodecode/controllers/journal.py
--- 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))
 
diff -r 9b0636e9b16b -r 44827c84dc66 rhodecode/public/css/style.css
--- 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;
diff -r 9b0636e9b16b -r 44827c84dc66 rhodecode/templates/journal/journal_data.html
--- 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>