From b641249fe36aa307cd2b29881441f3cc6f5ef28b Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Mon, 3 Sep 2012 12:11:15 +0200
Subject: Rename hash_id to message_id_hash to implement MM's IMessage
 interface

---
 hyperkitty/templates/messages/message.html | 4 ++--
 hyperkitty/views/message.py                | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'hyperkitty')

diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index c32805e..533d9ed 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -3,7 +3,7 @@
 <div class="email_header">
 	{% gravatar_img_for_email email.email 40 %}
 	<div class="email_author inline-block">
-		<span class="name"> <a href="{% url message_index mlist_fqdn=list_address, hashid=email.hash_id %}">{{email.sender_name}}</a> </span>
+		<span class="name"> <a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name}}</a> </span>
 		<br />
 		<span class="rank">Rank 8</span>
 	</div>
@@ -20,7 +20,7 @@
 
 	{{email.content}}
 </div>
-<ul class="email_info inline" messageid="{{email.hash_id}}">
+<ul class="email_info inline" messageid="{{email.message_id_hash}}">
 	<li class="neutral">
 		+{{email.likes}}/-{{email.dislikes}}
 	</li>
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 84997fd..89e1489 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -18,7 +18,10 @@ from hyperkitty.utils import log
 
 
 def index (request, mlist_fqdn, hashid):
-    ''' Displays a single message identified by its hash_id (derived from message_id) '''
+    '''
+    Displays a single message identified by its message_id_hash (derived from
+    message_id)
+    '''
     list_name = mlist_fqdn.split('@')[0]
 
     search_form = SearchForm(auto_id=False)
-- 
cgit