Merge pull request #1 from webfactor/1.0

1.0.1

Author: tswonke

resources/views/modal/create.blade.php

@@ -0,0 +1,56 @@
+@extends('webfactor::modal.modal_layout')
+
+@section('header')
+    <h3 class="box-title">{{ trans('backpack::crud.add_a_new') }} {{ $crud->entity_name }}</h3>
+@endsection
+
+@section('content')
+    <div class="row">
+        <div class="col-md-10 col-md-offset-1">
+        @include('crud::inc.grouped_errors')
+
+        <!-- load the view from the application if it exists, otherwise load the one in the package -->
+            @if(view()->exists('vendor.backpack.crud.form_content'))
+                @include('vendor.backpack.crud.form_content', ['fields' => $crud->getFields('create')])
+            @else
+                @include('crud::form_content', ['fields' => $crud->getFields('create')])
+            @endif
+        </div>
+    </div>
+@endsection
+
+@section('footer')
+    @include('webfactor::modal.inc.form_save_buttons')
+@endsection
+
+@push('crud_fields_scripts')
+    <script>
+        $("#create_{{ $entity }}").submit(function (e) {
+
+            $.ajax({
+                type: "POST",
+                url: "/{{ $crud->route . '/ajax' }}",
+                data: $("#create_{{ $entity }}").serialize(), // serializes the form's elements.
+                success: function (data) {
+                    new PNotify({
+                        type: "success",
+                        title: "Erfolg",
+                        text: "gespeichert"
+                    });
+
+                    $("#{{ $entity }}_modal").modal('toggle');
+                },
+                error: function (data) {
+                    new PNotify({
+                        type: "error",
+                        title: "Fehler",
+                        text: "Nicht gespeichert: " + data.responseText
+                    });
+                }
+            });
+
+            e.preventDefault(); // avoid to execute the actual submit of the form.
+        });
+    </script>
+
+@endpush

resources/views/modal/modal_layout.blade.php

@@ -0,0 +1,17 @@
+@stack('crud_fields_styles')
+{!! Form::open(['id' => 'create_'.$entity, 'files'=>$crud->hasUploadFields('create')]) !!}
+<div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+    </button>
+    @yield('header')
+</div>
+<div class="modal-body" id="modal-body">
+    @yield('content')
+</div>
+
+<div class="modal-footer">
+    @yield('footer')
+</div>
+{!! Form::close() !!}
+@stack('crud_fields_scripts')

src/InstantFieldsServiceProvider.php

@@ -17,8 +17,10 @@ class InstantFieldsServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        // publish views
-        $this->publishes([__DIR__ . '/../resources/views' => resource_path('views/vendor/backpack/crud')], 'views');
+        $this->loadViewsFrom(realpath(__DIR__ . '/../resources/views'), 'webfactor');
+
+        // publish fields
+        $this->publishes([__DIR__ . '/../resources/views/fields' => resource_path('views/vendor/backpack/crud/fields')], 'fields');
     }
 
     /**

src/Traits/CanBeCreatedOnTheFly.php

@@ -2,6 +2,8 @@
 
 namespace Webfactor\Laravel\Backpack\InstantFields;
 
+use Illuminate\Http\Request;
+
 trait CanBeCreatedOnTheFly
 {
     /**
@@ -35,7 +37,7 @@ public function ajaxCreate()
     {
         $this->crud->hasAccessOrFail('create');
 
-        return \View::make('backpack_ajax.create')
+        return \View::make('webfactor::modal.create')
             ->with('action', 'create')
             ->with('entity', $this->getAjaxEntity())
             ->with('crud', $this->crud)
@@ -46,12 +48,13 @@ public function ajaxCreate()
     }
 
     /**
-     * Checks permission and tries to store on-the-fly entity
+     * Checks permission and tries to store on-the-fly entity. If you want to enable request validation,
+     * please copy this method in your EntityCrudController and replace Request by your StoreRequest.
      *
      * @param StoreRequest $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function ajaxStore(StoreRequest $request)
+    public function ajaxStore(Request $request)
     {
         if (!$this->crud->hasAccess('create')) {
             return $this->ajaxRespondNoPermission();
@@ -93,4 +96,4 @@ private function ajaxRespondError()
     {
         return response()->json(['errors' => 'Could not save'], 422);
     }
-}
+}