From fe5985866065e2b77ef2c6b69e85b60153e89104 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Mon, 20 Aug 2012 17:17:04 +0200
Subject: Use message hash in URL instead of message ID

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

(limited to 'hyperkitty')

diff --git a/hyperkitty/api.py b/hyperkitty/api.py
index 88603e8..c39646e 100644
--- a/hyperkitty/api.py
+++ b/hyperkitty/api.py
@@ -20,7 +20,7 @@ class EmailResource(View):
 
     def get(self, request, mlist_fqdn, messageid):
         list_name = mlist_fqdn.split('@')[0]
-        email = STORE.get_message_by_id_from_list(list_name, messageid)
+        email = STORE.get_message_by_hash_from_list(list_name, messageid)
         if not email:
             return HttpResponse(status=404)
         else:
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index c128224..67d5653 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, messageid=email.message_id %}">{{email.sender}}</a> </span>
+		<span class="name"> <a href="{% url message_index mlist_fqdn=list_address, messageid=email.stable_url_id %}">{{email.sender}}</a> </span>
 		<br />
 		<span class="rank">Rank 8</span>
 	</div>
@@ -20,7 +20,7 @@
 
 	{{email.content}}
 </div>
-<ul class="email_info inline" messageid="{{email.message_id}}">
+<ul class="email_info inline" messageid="{{email.stable_url_id}}">
 	<li class="neutral">
 		+{{email.likes}}/-{{email.dislikes}}
 	</li>
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 7ab835b..194e3e9 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -25,7 +25,7 @@ def index (request, mlist_fqdn, messageid):
 
     search_form = SearchForm(auto_id=False)
     t = loader.get_template('message.html')
-    message = STORE.get_message_by_id_from_list(list_name, messageid)
+    message = STORE.get_message_by_hash_from_list(list_name, messageid)
     message.email = message.email.strip()
     # Extract all the votes for this message
     try:
-- 
cgit