From 89e7347a4e2dd5ce05ebb1f82fa4059ba49e282b Mon Sep 17 00:00:00 2001
From: Ian Kent <email@iankent.co.uk>
Date: Sun, 23 Nov 2014 15:47:58 +0000
Subject: [PATCH] UI fixes

---
 MailHog-Server/api/v1.go               | 10 +++++-----
 MailHog-UI/assets/templates/index.html |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MailHog-Server/api/v1.go b/MailHog-Server/api/v1.go
index f9c379f..e5fbb70 100644
--- a/MailHog-Server/api/v1.go
+++ b/MailHog-Server/api/v1.go
@@ -42,11 +42,11 @@ func CreateAPIv1(conf *config.Config, app *gotcha.App) *APIv1 {
 
 	r.Get("/api/v1/messages/?", apiv1.messages)
 	r.Delete("/api/v1/messages/?", apiv1.delete_all)
-	r.Get("/api/v1/messages/(?P<id>[0-9a-f]+)/?", apiv1.message)
-	r.Delete("/api/v1/messages/(?P<id>[0-9a-f]+)/?", apiv1.delete_one)
-	r.Get("/api/v1/messages/(?P<id>[0-9a-f]+)/download/?", apiv1.download)
-	r.Get("/api/v1/messages/(?P<id>[0-9a-f]+)/mime/part/(\\d+)/download/?", apiv1.download_part)
-	r.Post("/api/v1/messages/(?P<id>[0-9a-f]+)/release/?", apiv1.release_one)
+	r.Get("/api/v1/messages/(?P<id>[^\\?]+)/?", apiv1.message)
+	r.Delete("/api/v1/messages/(?P<id>[^\\?]+)/?", apiv1.delete_one)
+	r.Get("/api/v1/messages/(?P<id>[^\\?]+)/download/?", apiv1.download)
+	r.Get("/api/v1/messages/(?P<id>[^\\?]+)/mime/part/(\\d+)/download/?", apiv1.download_part)
+	r.Post("/api/v1/messages/(?P<id>[^\\?]+)/release/?", apiv1.release_one)
 	r.Get("/api/v1/events/?", apiv1.eventstream)
 
 	go func() {
diff --git a/MailHog-UI/assets/templates/index.html b/MailHog-UI/assets/templates/index.html
index b3506cb..332c3b6 100644
--- a/MailHog-UI/assets/templates/index.html
+++ b/MailHog-UI/assets/templates/index.html
@@ -163,7 +163,7 @@
         </tr>
       </thead>
       <tbody>
-        <tr ng-repeat="message in messages | filter:searchText" ng-click="selectMessage(message)" ng-class="{ selected: message.Id == preview.Id }">
+        <tr ng-repeat="message in messages | filter:searchText" ng-click="selectMessage(message)" ng-class="{ selected: message.ID == preview.ID }">
           <td>
             {{ message.From.Mailbox }}@{{ message.From.Domain }}
           </td>