Merge pull request #962 from eriknelson/bz1346087

1346087 - Fix attachment quantities at review
fusor · Jun 20, 2016 · d52399a · d52399a
2 parents 9a7a1f6 + 00afab4
commit d52399a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fusor-ember-cli/app/routes/review/installation.js b/fusor-ember-cli/app/routes/review/installation.js
@@ -36,6 +36,7 @@ export default Ember.Route.extend(NeedsExistingManifestHelpers, {
         modelHash.subscriptions = subModel.subscriptions;
       }
 
+      modelHash.sessionPortal = subModel.sessionPortal;
       // Does not need to be wrapped in an RSVP hash since the values have
       // already been resolved by the subscriptions route
       return modelHash;
@@ -68,7 +69,6 @@ export default Ember.Route.extend(NeedsExistingManifestHelpers, {
       });
     }
 
-    const subModel = this.controllerFor('subscriptions');
     if(modelHash.useExistingManifest) {
       controller.set('useExistingManifest', true);
       controller.set('reviewSubscriptions', modelHash.subscriptions);
@@ -83,7 +83,7 @@ export default Ember.Route.extend(NeedsExistingManifestHelpers, {
       }, false); // initial val
       controller.set('reviewSubscriptions', reviewSubscriptions);
       controller.set('hasSubscriptionsToAttach', hasSubs);
-      controller.set('hasSessionPortal', subModel ? subModel.sessionPortal : null);
+      controller.set('hasSessionPortal', !!modelHash.sessionPortal);
       controller.set('hasSubscriptionPools', Ember.isPresent(this.controllerFor('subscriptions/select-subscriptions').get('subscriptionPools')));
     }