Merge pull request #819 from code-corps/812-reload-donation-progress-upon-donating

Add explicit reloading of project upon donation

Author: begedin

app/routes/project/donate.js

@@ -15,11 +15,9 @@ export default Route.extend(AuthenticatedRouteMixin, {
   userSubscriptions: service(),
 
   model() {
-    let project = this.modelFor('project');
-
-    return RSVP.hash({
-      project,
-      subscription: this.get('userSubscriptions').fetchForProject(project)
+    return this.modelFor('project').reload().then((project) => {
+      let subscription = this.get('userSubscriptions').fetchForProject(project);
+      return RSVP.hash({ project, subscription });
     });
   },
 

app/routes/project/index.js

@@ -10,15 +10,13 @@ export default Route.extend({
   userSubscriptions: service(),
 
   model() {
-    let project = this.modelFor('project');
-
-    return RSVP.hash({
-      project,
-      subscription: this.get('userSubscriptions').fetchForProject(project)
+    return this.modelFor('project').reload().then((project) => {
+      let subscription = this.get('userSubscriptions').fetchForProject(project);
+      return RSVP.hash({ project, subscription });
     });
   },
 
-  setupController(controller, models) {
-    controller.setProperties(models);
+  setupController(controller, { project, subscription }) {
+    controller.setProperties({ project, subscription });
   }
 });

app/routes/project/settings.js

@@ -12,6 +12,10 @@ export default Route.extend(AuthenticatedRouteMixin, CanMixin, {
   credentials: service(),
   session: service(),
 
+  model() {
+    return this.modelFor('project').reload();
+  },
+
   beforeModel() {
     if (get(this, 'session.isAuthenticated')) {
       let organization = this.modelFor('project.organization');

app/routes/project/settings/contributors.js

@@ -4,7 +4,6 @@ const { Route } = Ember;
 
 export default Route.extend({
   model() {
-    let project = this.modelFor('project');
-    return project;
+    return this.modelFor('project');
   }
 });

app/routes/project/tasks.js

@@ -4,7 +4,6 @@ const { Route } = Ember;
 
 export default Route.extend({
   model() {
-    let project = this.modelFor('project');
-    return project;
+    return this.modelFor('project').reload();
   }
 });

app/routes/project/tasks/index.js

@@ -1,8 +1,10 @@
 import Ember from 'ember';
 
 const {
+  get,
   merge,
-  Route
+  Route,
+  RSVP
  } = Ember;
 
 export default Route.extend({
@@ -14,13 +16,17 @@ export default Route.extend({
 
   model(params) {
     let project = this.modelFor('project');
-    let fullParams = merge(params, { projectId: project.get('id') });
-    return this.get('store').query('task', fullParams);
+
+    let projectId = project.get('id');
+    let fullParams = merge(params, { projectId });
+
+    let tasks =  get(this, 'store').query('task', fullParams);
+
+    return RSVP.hash({ project, tasks });
   },
 
-  setupController(controller) {
-    controller.set('project', this.modelFor('project'));
-    this._super(...arguments);
+  setupController(controller, { project, tasks }) {
+    controller.setProperties({ project, tasks });
   },
 
   // there is a semi-known ember bug, where a query parameter with an initial value not set to null

app/routes/project/thank-you.js

@@ -4,4 +4,7 @@ import Ember from 'ember';
 const { Route } = Ember;
 
 export default Route.extend(AuthenticatedRouteMixin, {
+  model() {
+    return this.modelFor('project').reload();
+  }
 });

app/templates/project/tasks/index.hbs

@@ -5,7 +5,7 @@
   filterByStatus="filterByStatus"
   filterByType="filterByType"
   pageNumber=page
-  tasks=model
+  tasks=tasks
   project=project
   removeTypeFilter="removeTypeFilter"
   selectedTypes=selectedTypes