start swapping display names with names

RobertLowe · Jan 23, 2019 · 16645d6 · 16645d6
1 parent ad7c2a9
commit 16645d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/frontend/src/metabase/query_builder/components/dataref/FieldPane.jsx b/frontend/src/metabase/query_builder/components/dataref/FieldPane.jsx
@@ -126,8 +126,8 @@ export default class FieldPane extends Component {
 
     const query = question.query();
 
-    let fieldName = field.display_name;
-    let tableName = query.table() ? query.table().display_name : "";
+    let fieldName = field.name;
+    let tableName = query.table() ? query.table().name : "";
 
     let useForCurrentQuestion = [],
       usefulQuestions = [];
@@ -162,15 +162,15 @@ export default class FieldPane extends Component {
       usefulQuestions.push(
         <QueryButton
           icon="number"
-          text={t`Sum of all values of ${fieldName}`}
+          text={t`Sum of all values`}
           onClick={this.setQuerySum}
         />,
       );
     }
     usefulQuestions.push(
       <QueryButton
         icon="table"
-        text={t`All distinct values of ${fieldName}`}
+        text={t`See all distinct values`}
         onClick={this.setQueryDistinct}
       />,
     );

diff --git a/frontend/src/metabase/query_builder/components/dataref/MainPane.jsx b/frontend/src/metabase/query_builder/components/dataref/MainPane.jsx
@@ -38,7 +38,7 @@ const MainPane = ({ databases, show }) => (
                       className="text-brand text-brand-darken-hover no-decoration"
                       onClick={() => show("table", table)}
                     >
-                      {table.display_name}
+                      {table.name}
                     </a>
                   </li>
                 ))}

diff --git a/frontend/src/metabase/query_builder/components/dataref/TablePane.jsx b/frontend/src/metabase/query_builder/components/dataref/TablePane.jsx
@@ -139,7 +139,7 @@ export default class TablePane extends Component {
                 key={item.id}
                 onClick={() => this.props.show(itemType, item)}
               >
-                {item.display_name || item.name}
+                {item.name}
               </ListItem>
             ))}
           </ul>