fill warnings property on the validations object

refs adopted-ember-addons#527
zidjian257 · Sep 8, 2017 · ab1b493 · ab1b493
1 parent 817a0a8
commit ab1b493
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/addon/validations/result-collection.js b/addon/validations/result-collection.js
@@ -250,8 +250,8 @@ export default Ember.ArrayProxy.extend({
    * @readOnly
    * @type {Array}
    */
-  warnings: computed('attribute', '_warningContent.@each.errors', cycleBreaker(function() {
-    return computeErrorCollection(get(this, 'attribute'), get(this, '_warningContent'));
+  warnings: computed('attribute', '_warningContent.@each.warnings', cycleBreaker(function() {
+    return computeErrorCollection(get(this, 'attribute'), get(this, '_warningContent'), "warnings");
   })).readOnly(),
 
   /**
@@ -350,10 +350,10 @@ export default Ember.ArrayProxy.extend({
   })).readOnly(),
 
   /**
-  * @property _contentValidations
-  * @type {Array}
-  * @private
-  */
+   * @property _contentValidations
+   * @type {Array}
+   * @private
+   */
   _contentValidations: computed('content.@each._validations', function() {
     return emberArray(compact(this.getEach('_validations')));
   }).readOnly(),
@@ -380,8 +380,8 @@ export default Ember.ArrayProxy.extend({
   _warningContent: computed.filterBy('content', 'isWarning', true).readOnly()
 });
 
-function computeErrorCollection(attribute, content = []) {
-  let errors = flatten(content.getEach('errors'));
+function computeErrorCollection(attribute, content = [], errorProperty="errors") {
+  let errors = flatten(content.getEach(errorProperty));
 
   errors = uniq(compact(errors));
   errors.forEach((e) => {