Merge pull request #49 from cevi/develop

Korrektur für Modals und EditPost
cevi · Sep 1, 2024 · eb0cc50 · eb0cc50
2 parents bcc4837 + 4bf94ba
commit eb0cc50
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/resources/views/admin/camps/edit.blade.php b/resources/views/admin/camps/edit.blade.php
@@ -66,8 +66,10 @@
                     showCancelButton: true,
                     confirmButtonText: 'Ja',
                     cancelButtonText: 'Abbrechen',
-                }).then((willDelete) => {
-                    if (willDelete) {
+                    confirmButtonColor: 'blue',
+                    cancelButtonColor: 'red',
+                }).then((result) => {
+                    if (result.isConfirmed) {
                         document.getElementById("DeleteForm").submit();
                     }
                 });

diff --git a/resources/views/admin/camps/index.blade.php b/resources/views/admin/camps/index.blade.php
@@ -108,8 +108,10 @@
                     showCancelButton: true,
                     confirmButtonText: 'Ja',
                     cancelButtonText: 'Abbrechen',
-                }).then((willDelete) => {
-                    if (willDelete) {
+                    confirmButtonColor: 'blue',
+                    cancelButtonColor: 'red',
+                }).then((result) => {
+                    if (result.isConfirmed) {
                         document.getElementById("DeleteForm").submit();
                     }
                 });

diff --git a/resources/views/admin/surveys/index.blade.php b/resources/views/admin/surveys/index.blade.php
@@ -50,8 +50,10 @@
                     showCancelButton: true,
                     confirmButtonText: 'Ja',
                     cancelButtonText: 'Abbrechen',
-                }).then((willCreate) => {
-                    if (willCreate) {
+                    confirmButtonColor: 'blue',
+                    cancelButtonColor: 'red',
+                }).then((result) => {
+                    if (result.isConfirmed) {
                         $.ajaxSetup({
                             headers: {
                                     'X-CSRF-TOKEN': '{{ csrf_token() }}'

diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php
@@ -95,8 +95,10 @@
                     showCancelButton: true,
                     confirmButtonText: 'Ja',
                     cancelButtonText: 'Abbrechen',
-                }).then((willDelete) => {
-                    if (willDelete) {
+                    confirmButtonColor: 'blue',
+                    cancelButtonColor: 'red',
+                }).then((result) => {
+                    if (result.isConfirmed) {
                         document.getElementById("DeleteForm").submit();
                     }
                 });

diff --git a/resources/views/home/post_delete.blade.php b/resources/views/home/post_delete.blade.php
@@ -3,13 +3,17 @@
         $('.confirm').on('click', function(e){
             e.preventDefault(); //cancel default action
 
-            swal({
+            Swal.fire({
                 title: 'Rückmeldung löschen?',
                 text: 'Willst du die Rückmeldung wirklich löschen?',
                 icon: 'info',
-                buttons: ["Abbrechen", "Ja"],
-            }).then((willDelete) => {
-                if (willDelete) {
+                showCancelButton: true,
+                confirmButtonText: 'Ja',
+                cancelButtonText: 'Abbrechen',
+                confirmButtonColor: 'blue',
+                cancelButtonColor: 'red',
+            }).then((result) => {
+                if (result.isConfirmed) {
                     document.getElementById("DeleteForm").submit();
                 }
             });
@@ -21,4 +25,5 @@ function editPost(post) {
         $('#user_id').val(post['user_id']);
         $('#show_on_survey').prop("checked", post['show_on_survey']);
     }
+    window.editPost = editPost;
 </script>