change method to load modal content

Author: tswonke

resources/views/fields/inc/button-add.blade.php

@@ -1,11 +1,12 @@
 <span class="input-group-btn">
     <button
-        href="{{ $field['on_the_fly']['create_view'] ?? backpack_url($field['on_the_fly']['entity']).'/ajax/create?field_name='.$field['name'].'&attribute='.($field['on_the_fly']['attribute'] ?? 'name') }}"
+        href="#"
         type="button"
         class="btn btn-primary"
         style="border-radius: 0px"
         data-toggle="modal"
-        data-target="#{{ $field['on_the_fly']['entity'] ?? 'ajax_entity' }}_create_modal">
+        data-target="#{{ $field['on_the_fly']['entity'] ?? 'ajax_entity' }}_create_modal"
+        data-load-url="{{ $field['on_the_fly']['create_view'] ?? backpack_url($field['on_the_fly']['entity']).'/ajax/create?field_name='.$field['name'].'&attribute='.($field['on_the_fly']['attribute'] ?? 'name') }}">
     <i class="fa fa-plus"></i>
     </button>
 </span>

resources/views/fields/inc/button-edit.blade.php

@@ -1,12 +1,13 @@
 <span class="input-group-btn">
     <button
-        href="{{ $field['on_the_fly']['edit_view'] ?? backpack_url($field['on_the_fly']['entity']).'/ajax/edit?field_name='.$field['name'].'&attribute='.($field['on_the_fly']['attribute'] ?? 'name') }}&id=1"
+        href="#"
         type="button"
         class="btn btn-warning"
         style="border-radius: 0px"
         data-toggle="modal"
+        data-id="{{ $field['value'] ?? '' }}"
         data-target="#{{ $field['on_the_fly']['entity'] ?? 'ajax_entity' }}_edit_modal"
-        onclick="">
+        data-load-url="{{ $field['on_the_fly']['edit_view'] ?? backpack_url($field['on_the_fly']['entity']).'/ajax/edit?field_name='.$field['name'].'&attribute='.($field['on_the_fly']['attribute'] ?? 'name') }}">
     <i class="fa fa-pencil"></i>
     </button>
 </span>

resources/views/fields/select2_from_ajax.blade.php

@@ -89,6 +89,26 @@ class="form-control"
 @push('crud_fields_scripts')
     <script>
         jQuery(document).ready(function ($) {
+
+            // load create modal content
+            $("#{{ $field['on_the_fly']['entity'] ?? 'ajax_entity' }}_create_modal").on('show.bs.modal', function (e) {
+                var loadurl = $(e.relatedTarget).data('load-url');
+                $(this).find('.modal-content').load(loadurl);
+            });
+
+            // load edit modal content
+            $("#{{ $field['on_the_fly']['entity'] ?? 'ajax_entity' }}_edit_modal").on('show.bs.modal', function (e) {
+                var loadurl = $(e.relatedTarget).data('load-url');
+                var id = $(e.relatedTarget).data('id');
+                $(this).find('.modal-content').load(loadurl + '&id=' + id);
+            });
+
+            // update id for edit modal url
+            $("#select2_ajax_{{ $field['name'] }}").change(function (e) {
+                $("[data-target='#{{ $field['on_the_fly']['entity'] ?? 'ajax_entity' }}_edit_modal']")
+                    .data("id", $("#select2_ajax_{{ $field['name'] }}").select2('data')[0].id);
+            })
+
             // trigger select2 for each untriggered select2 box
             $("#select2_ajax_{{ $field['name'] }}").each(function (i, obj) {
                 var form = $(obj).closest('form');

resources/views/fields/select2_from_ajax_multiple.blade.php

@@ -69,6 +69,12 @@
 @push('crud_fields_scripts')
     <script>
         jQuery(document).ready(function ($) {
+            // load create modal content
+            $("#{{ $field['on_the_fly']['entity'] ?? 'ajax_entity' }}_create_modal").on('show.bs.modal', function (e) {
+                var loadurl = $(e.relatedTarget).data('load-url');
+                $(this).find('.modal-content').load(loadurl);
+            });
+
             // trigger select2 for each untriggered select2 box
             $("#select2_ajax_multiple_{{ $field['name'] }}").each(function (i, obj) {
                 var form = $(obj).closest('form');

resources/views/modal/create.blade.php

@@ -39,7 +39,7 @@
                         text: "{{ trans('backpack::crud.insert_success') }}"
                     });
 
-                    $("#{{ $entity }}_create_modal").modal('toggle');
+                    $("#{{ $entity }}_create_modal").modal('hide');
 
                     // provide auto-fill
 
@@ -62,9 +62,6 @@
                     setTimeout(function () {
                         $('.select2-results__option').trigger("mouseup");
                     }, 200);
-
-                    console.log(data)
-
                 },
                 error: function (data) {
                     new PNotify({

resources/views/modal/edit.blade.php

@@ -38,7 +38,7 @@
                         text: "{{ trans('backpack::crud.update_success') }}"
                     });
 
-                    $("#{{ $entity }}_edit_modal").modal('toggle');
+                    $("#{{ $entity }}_edit_modal").modal('hide');
 
                     // provide auto-fill
 
@@ -62,9 +62,6 @@
                     setTimeout(function () {
                         $('.select2-results__option').trigger("mouseup");
                     }, 200);
-
-                    console.log(data)
-
                 },
                 error: function (data) {
                     new PNotify({