backup commit

2018-04-24 17:44:06 -03:00
parent ad7006a781
commit e2876d9486
2 changed files with 30 additions and 4 deletions
@@ -78,7 +78,9 @@ export default Ember.Mixin.create ApplicationRouteMixin,
        options = {model: options.content}
      else if typeof options isnt 'object'
        options = {model: options}
-      options.model = options.model.content if options.model?.promise? and options.model.content
+
+      # opening a model on an unresolved promise is a bad thing, so we can assume (model) promise content for non paginated arrays as model
+      options.model = options.model.content if options.model?.promise? and options.model.content and not options.model.dunlop_remote_array
      container = Ember.getOwner(@)

      modalNameParts = modalName.split('/')