Fix date handling, fix CLI template rendering

startupstorm · Jul 8, 2013 · 6535b6f · 6535b6f
1 parent aae2faf
commit 6535b6f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/mailpile/plugins/dates.py b/mailpile/plugins/dates.py
@@ -42,11 +42,11 @@ def search(config, term, hits):
       end.extend([12, 31])
     elif len(end) == 2:
       end.append(31)
-    if not start < end:
+    if not start <= end:
       raise ValueError()
 
     terms = []
-    while start < end:
+    while start <= end:
       # Move forward one year?
       if start[1:] == [1, 1]:
         ny = [start[0], 12, 31]

diff --git a/mailpile/ui.py b/mailpile/ui.py
@@ -57,7 +57,11 @@ def __init__(self, log_parent=None):
     self.time_tracking = [('Main', [])]
     self.last_display = [self.LOG_PROGRESS, 0]
     self.render_mode = 'text'
-    self.html_variables = {}
+    self.html_variables = {
+      'title': 'Mailpile',
+      'name': 'Bradley Manning',
+      'csrf': '',
+    }
 
   # Logging
   def _display_log(self, text, level=LOG_URGENT):

diff --git a/static/default/html/search-result-messages.html b/static/default/html/search-result-messages.html
@@ -1,6 +1,6 @@
 				<tr class="result odd t_inbox t_sent" data-state="normal">
 					<td class="from"><a href="%(url)s">%(from)s</a></td>
 					<td class="subject"><a href="%(url)s">%(subject)s</a></td>
-					<td class="date"><a href="?q=date:2010-1-9">2010-01-09</a></td>
+					<td class="date"><a href="/_/search/dates:%(date)s">%(date)s</a></td>
 					<td class="checkbox"><input type="checkbox" name="msg_%(idx)s" value="normal"></td>
 				</tr>