From f986ca757d6b866e1c9535a08d310284e644a2f8 Mon Sep 17 00:00:00 2001 From: Tom Robinson <tlrobinson@gmail.com> Date: Mon, 8 Oct 2018 15:08:48 -0700 Subject: [PATCH] Don't show number style setting for currency fields --- .../src/metabase/admin/datamodel/containers/FieldApp.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx b/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx index a1f5c8b7e58..ef77f89746a 100644 --- a/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx +++ b/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx @@ -52,6 +52,7 @@ import Metadata from "metabase-lib/lib/metadata/Metadata"; import { has_field_values_options } from "metabase/lib/core"; import colors from "metabase/lib/colors"; import { getGlobalSettingsForColumn } from "metabase/visualizations/lib/settings/column"; +import { isCurrency } from "metabase/lib/schema_metadata"; const mapStateToProps = (state, props) => { return { @@ -364,7 +365,11 @@ const FieldSettingsPane = ({ field, onUpdateFieldSettings }) => ( value={(field && field.settings) || {}} onChange={onUpdateFieldSettings} column={field} - blacklist={new Set(["column_title"])} + blacklist={ + new Set( + ["column_title"].concat(isCurrency(field) ? ["number_style"] : []), + ) + } inheritedSettings={getGlobalSettingsForColumn(field)} /> </Section> -- GitLab