Fixed enrollment

svsticky · Jun 17, 2020 · 7c61fae · 7c61fae
1 parent c163e0d
commit 7c61fae
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/app/assets/javascripts/members/activities/activities.js b/app/assets/javascripts/members/activities/activities.js
@@ -59,12 +59,14 @@ function confirm_enroll(activity) {
       cancelButtonText: I18n.t('members.activities.actions.cancel'),
     }).then(
     // on confirm
-    function () {
-      if (activity.has_un_enroll_date_passed())
-        confirm_un_enroll_date_passed(activity);
-      else {
-        activity.enroll();
-      }
+    function (result) {
+        if (result.value) {
+            if (activity.has_un_enroll_date_passed())
+                confirm_un_enroll_date_passed(activity);
+            else {
+                activity.enroll();
+            }
+        }
     }
   );
 }
@@ -103,8 +105,8 @@ function confirm_un_enroll(activity) {
 
     }).then(
     // anonymous function, because this is set to the sweetalert
-    function () {
-      activity.un_enroll();
+    function (result) {
+      if(result.value)activity.un_enroll();
     }
   );
 }
@@ -119,8 +121,8 @@ function confirm_update(activity) {
       cancelButtonText: I18n.t('members.activities.actions.cancel'),
     }).then(
     // anonymous function, because this is set to the sweetalert
-    function () {
-      activity.edit_enroll();
+    function (result) {
+        if(result.value) activity.edit_enroll();
     }
   );
 }