X-Git-Url: http://repos.xcallymotion.com/?a=blobdiff_plain;f=server%2Fmodels%2Fanalytics_default_report.js;h=7cb2dab878a45cb6aeddec5ade1af05ea5d64576;hb=d168c38956e2b3512dfb925e8c7f496a3cb1fed0;hp=05f5616a7810c7436a159deb485ad92782304b3f;hpb=7d2c48c68a9c0d1f3f9822e1ce6092e864bdd875;p=motion.git diff --git a/server/models/analytics_default_report.js b/server/models/analytics_default_report.js index 05f5616..7cb2dab 100644 --- 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: [{