Merge pull request #2315 from metabase/fix-default-time-formatting

Fix default time formatting + column header
metabase · Apr 5, 2016 · ba7fba0 · ba7fba0
2 parents 1b19a33 + c45db96
commit ba7fba0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/frontend/src/lib/formatting.js b/frontend/src/lib/formatting.js
@@ -50,6 +50,9 @@ function formatMajorMinor(major, minor, options = {}) {
 
 function formatTimeWithUnit(value, unit, options = {}) {
     let m = parseTimestamp(value);
+    if (!m.isValid()) {
+        return String(value);
+    }
     switch (unit) {
         case "hour": // 12 AM - January 1, 2015
             return formatMajorMinor(m.format("h A"), m.format("MMMM D, YYYY"), options);
@@ -75,8 +78,9 @@ function formatTimeWithUnit(value, unit, options = {}) {
             return moment().week(value).format("wo");
         case "month-of-year": // January
             return moment().month(value - 1).format("MMMM");
+        default:
+            return m.format("LLLL");
     }
-    return String(value);
 }
 
 export function formatValue(value, options = {}) {

diff --git a/frontend/src/visualizations/TableInteractive.jsx b/frontend/src/visualizations/TableInteractive.jsx
@@ -227,7 +227,7 @@ export default class TableInteractive extends Component {
             colVal = (column && column.display_name && column.display_name.toString()) ||
                      (column && column.name && column.name.toString());
 
-        if (column.unit) {
+        if (column.unit && column.unit !== "default") {
             colVal += ": " + capitalize(column.unit.replace(/-/g, " "))
         }