Merge pull request #177 from julianpoy/bug/#176-cant-delete-meal-plan

Bug/#176 Fix meal plan delete button
julianpoy · Mar 3, 2019 · cfcc278 · cfcc278
2 parents 83b459b + 096b087
commit cfcc278
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Backend/routes/mealPlans.js b/Backend/routes/mealPlans.js
@@ -192,7 +192,7 @@ router.delete(
         res.status(404).send("Meal plan not found or not visible to you!");
       } else {
         if (mealPlan.userId === res.locals.session.userId) {
-          return mealPlan.destroy(function () {
+          return mealPlan.destroy().then(() => {
             for (var i = 0; i < (mealPlan.collaborators || []).length; i++) {
               GripService.broadcast(mealPlan.collaborators[i], 'mealPlan:removed', {
                 mealPlanId: mealPlan.id,

diff --git a/Frontend/src/pages/info-components/release-notes/release-notes.html b/Frontend/src/pages/info-components/release-notes/release-notes.html
@@ -24,6 +24,7 @@
   - Recipe bulk actions: press and hold a recipe for actions on multiple recipes at once<br />
   - New iconography for menus<br />
   - Better client-side error handling<br />
+  - Fixed a bug that caused the meal plan delete button to be broken<br />
 
   <br />
 

diff --git a/Frontend/src/pages/meal-plan-components/meal-plan-popover/meal-plan-popover.ts b/Frontend/src/pages/meal-plan-components/meal-plan-popover/meal-plan-popover.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams, ToastController, ViewController, AlertController } from 'ionic-angular';
 import { LoadingServiceProvider } from '../../../providers/loading-service/loading-service';
-import { ShoppingListServiceProvider } from '../../../providers/shopping-list-service/shopping-list-service';
+import { MealPlanServiceProvider } from '../../../providers/meal-plan-service/meal-plan-service';
 import { UtilServiceProvider } from '../../../providers/util-service/util-service';
 
 @IonicPage({
@@ -22,7 +22,7 @@ export class MealPlanPopoverPage {
     public navParams: NavParams,
     public utilService: UtilServiceProvider,
     public loadingService: LoadingServiceProvider,
-    public shoppingListService: ShoppingListServiceProvider,
+    public mealPlanService: MealPlanServiceProvider,
     public toastCtrl: ToastController,
     public viewCtrl: ViewController,
     public alertCtrl: AlertController
@@ -67,7 +67,7 @@ export class MealPlanPopoverPage {
   _deleteMealPlan() {
     var loading = this.loadingService.start();
 
-    this.shoppingListService.unlink({
+    this.mealPlanService.unlink({
       id: this.mealPlanId
     }).subscribe(() => {
       loading.dismiss();