Built motion from commit c2984ba.|0.0.114

[motion.git] / server / models / analytics_default_report.js

diff --git a/server/models/analytics_default_report.js b/server/models/analytics_default_report.js
index 05f5616..7cb2dab 100644 (file)
--- a/server/models/analytics_default_report.js
+++ b/server/models/analytics_default_report.js
@@ -21,7 +21,7 @@ module.exports = function(sequelize, DataTypes) {
           model: models.ReportField,
           as: 'Fields',
           required: false,
-          attributes: ['field', 'alias', 'function', 'groupBy', 'orderBy', 'MetricId', 'format'],
+          attributes: ['field', 'alias', 'function', 'groupBy', 'orderBy', 'DefaultMetricId', 'format', 'custom'],
         }]
       });
 
@@ -31,9 +31,9 @@ module.exports = function(sequelize, DataTypes) {
             model: models.ReportField,
             as: 'Fields',
             required: false,
-            attributes: ['field', 'alias', 'function', 'groupBy', 'orderBy', 'MetricId', 'format'],
+            attributes: ['field', 'alias', 'function', 'groupBy', 'orderBy', 'DefaultMetricId', 'format', 'custom'],
             include: [{
-              model: models.Metric,
+              model: models.DefaultMetric,
               attributes: ['description', 'metric', 'name', 'table'],
               required: false,
               include: [{