Merge pull request #9790 from spiffxp/month-in-g8r-shorttimestamp

Include the month in gubernator shorttimestamp filters
kubernetes · Oct 13, 2018 · 9a88e32 · 9a88e32
2 parents cb70002 + 16c67e0
commit 9a88e32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gubernator/filters.py b/gubernator/filters.py
@@ -45,7 +45,7 @@ def do_dt_to_epoch(dt):
 def do_shorttimestamp(unix_time):
     t = datetime.datetime.utcfromtimestamp(unix_time)
     return jinja2.Markup('<span class="shorttimestamp" data-epoch="%s">%s</span>' %
-                         (unix_time, t.strftime('%d %H:%M')))
+                         (unix_time, t.strftime('%m-%d %H:%M')))
 
 
 def do_duration(seconds):

diff --git a/gubernator/static/build.js b/gubernator/static/build.js
@@ -31,7 +31,7 @@ function fix_timestamps() {
 		}
 	}
 	replace('timestamp', 'YYYY-MM-DD HH:mm z')
-	replace('shorttimestamp', 'DD HH:mm')
+	replace('shorttimestamp', 'MM-DD HH:mm')
 	replace('humantimestamp', function(t) {
 		var fmt = 'MMM D, Y';
 		if (t.isAfter(moment().startOf('day'))) {