Skip to content
Snippets Groups Projects
Commit 6ac74314 authored by Tom Robinson's avatar Tom Robinson
Browse files

Misc settings tweaks

parent 937eb5e3
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,7 @@ const SETTING_TYPES = [
"date_style",
"date_separator",
"date_abbreviate",
"time_enabled",
// "time_enabled",
"time_style",
],
column: {
......
......@@ -43,7 +43,7 @@ const ColumnSettings = ({
// add a "unit" to make certain settings work
if (column.unit == null) {
column = { ...column, unit: "millisecond" };
column = { ...column, unit: "default" };
}
// $FlowFixMe
......
......@@ -448,7 +448,7 @@ export default class TableInteractive extends Component {
const column = cols[columnIndex];
let columnTitle =
settings.column(column)._column_title_full || formatColumn(column);
settings.column(column)["_column_title_full"] || formatColumn(column);
if (!columnTitle && this.props.isPivoted && columnIndex !== 0) {
columnTitle = t`Unset`;
......
......@@ -154,7 +154,7 @@ export default class TableSimple extends Component {
}}
/>
<Ellipsified>
{settings.column(col)._column_title_full ||
{settings.column(col)["_column_title_full"] ||
formatColumn(col)}
</Ellipsified>
</div>
......
......@@ -228,10 +228,15 @@ export const DATE_COLUMN_SETTINGS = {
{ name: t`Off`, value: null },
{ name: t`HH:MM`, value: "minutes" },
];
if (!unit || unit === "default" || unit === "second") {
if (
!unit ||
unit === "default" ||
unit === "second" ||
unit === "millisecond"
) {
options.push({ name: t`HH:MM:SS`, value: "seconds" });
}
if (!unit || unit === "default") {
if (!unit || unit === "default" || unit === "millisecond") {
options.push({ name: t`HH:MM:SS.MS`, value: "milliseconds" });
}
if (options.length === 2) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment