From d85144d276a727db7d8fb6b957cba11ffbe190f5 Mon Sep 17 00:00:00 2001
From: metamben <103100869+metamben@users.noreply.github.com>
Date: Tue, 28 Mar 2023 03:02:11 +0300
Subject: [PATCH] Fix some display name calculations for filters (#29447)
---
src/metabase/lib/filter.cljc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/metabase/lib/filter.cljc b/src/metabase/lib/filter.cljc
index d33824c68ed..289722ab9d0 100644
--- a/src/metabase/lib/filter.cljc
+++ b/src/metabase/lib/filter.cljc
@@ -27,11 +27,11 @@
(defmethod lib.metadata.calculation/display-name-method :segment
[query _stage-number [_tag _opts segment-id]]
- (clojure.core/or
- (when-let [segment-metadata (lib.metadata/segment query segment-id)]
+ (let [segment-metadata (lib.metadata/segment query segment-id)]
+ (clojure.core/or
(:display_name segment-metadata)
- (some->> (:name segment-metadata) (u.humanization/name->human-readable-name :simple)))
- (i18n/tru "[Unknown Segment]")))
+ (some->> (:name segment-metadata) (u.humanization/name->human-readable-name :simple))
+ (i18n/tru "[Unknown Segment]"))))
(defmethod lib.metadata.calculation/display-name-method :and
[query stage-number [_tag _opts & subclauses]]
@@ -43,7 +43,7 @@
(defmethod lib.metadata.calculation/display-name-method :or
[query stage-number [_tag _opts & subclauses]]
(lib.util/join-strings-with-conjunction
- (i18n/tru "and")
+ (i18n/tru "or")
(for [clause subclauses]
(lib.metadata.calculation/display-name query stage-number clause))))
--
GitLab