Merge branch 'master' of github.com:metabase/metabase-init into create_dashboard

deploy/deploy_prototype.sh

@@ -4,13 +4,10 @@ set -eo pipefail
 BASEDIR=$(dirname $0)
 source "$BASEDIR/functions"
 
-if [ -z $1 ]; then
-  echo "Oops!  You need to specify the name of the EB app version to deploy."
-  exit 1
-fi
-
-EB_VERSION_LABEL=$1
 EB_ENVIRONMENT=metabase-proto
 
+# create EB version
+create_eb_version
+
 # deploy EB version to environment
-deploy_version ${EB_ENVIRONMENT} ${EB_VERSION_LABEL}
+deploy_version ${EB_ENVIRONMENT}

resources/frontend_client/app/card/card.controllers.js

@@ -480,6 +480,12 @@ CardControllers.controller('CardDetail', [
 
                 } else {
                     isObjectDetail = false;
+
+                    // if we are display bare rows, filter out columns with preview_display = false
+                    if (Query.isStructured(dataset_query) &&
+                            Query.isBareRowsAggregation(dataset_query.query)) {
+                        queryResult.data = DataGrid.filterOnPreviewDisplay(queryResult.data);
+                    }
                 }
 
                 // try a little logic to pick a smart display for the data
@@ -504,12 +510,6 @@ CardControllers.controller('CardDetail', [
                     card.display = "table";
                 }
 
-                // if we are display bare rows, filter out columns with preview_display = false
-                if (Query.isStructured(dataset_query) &&
-                        Query.isBareRowsAggregation(dataset_query.query)) {
-                    queryResult.data = DataGrid.filterOnPreviewDisplay(queryResult.data);
-                }
-
                 renderAll();
 
             }, function (error) {