Laravel 6 bugfixes (#4388)

* Change faulty route-usage * Remove non-existing multilingual.js from read-view This file is included from the main app.js already and doesn't exist in /published
thedevdojo · Sep 9, 2019 · dda0773 · dda0773
1 parent 321f4dd
commit dda0773
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/resources/views/bread/browse.blade.php b/resources/views/bread/browse.blade.php
@@ -351,7 +351,7 @@
 
         var deleteFormAction;
         $('td').on('click', '.delete', function (e) {
-            $('#delete_form')[0].action = '{{ route('voyager.'.$dataType->slug.'.destroy', ['id' => '__id']) }}'.replace('__id', $(this).data('id'));
+            $('#delete_form')[0].action = '{{ route('voyager.'.$dataType->slug.'.destroy', '__id') }}'.replace('__id', $(this).data('id'));
             $('#delete_modal').modal('show');
         });
 

diff --git a/resources/views/bread/read.blade.php b/resources/views/bread/read.blade.php
@@ -165,7 +165,6 @@
                 $('.side-body').multilingual();
             });
         </script>
-        <script src="{{ voyager_asset('js/multilingual.js') }}"></script>
     @endif
     <script>
         var deleteFormAction;

diff --git a/resources/views/tools/bread/edit-add.blade.php b/resources/views/tools/bread/edit-add.blade.php
@@ -44,7 +44,7 @@
             {{ $display_name }}
         </a>
         @else
-        <a href="{{ route('voyager.bread.create', ['name' => $table]) }}">
+        <a href="{{ route('voyager.bread.create', $table) }}">
             {{ $display_name }}
         </a>
         @endif

diff --git a/resources/views/tools/bread/index.blade.php b/resources/views/tools/bread/index.blade.php
@@ -52,7 +52,7 @@ class="btn btn-danger btn-sm delete">
                                     <i class="voyager-trash"></i> {{ __('voyager::generic.delete') }}
                                 </a>
                             @else
-                                <a href="{{ route('voyager.bread.create', ['name' => $table->name]) }}"
+                                <a href="{{ route('voyager.bread.create', $table->name) }}"
                                    class="_btn btn-default btn-sm pull-right">
                                     <i class="voyager-plus"></i> {{ __('voyager::bread.add_bread') }}
                                 </a>
@@ -74,7 +74,7 @@ class="_btn btn-default btn-sm pull-right">
                     <h4 class="modal-title"><i class="voyager-trash"></i>  {!! __('voyager::bread.delete_bread_quest', ['table' => '<span id="delete_builder_name"></span>']) !!}</h4>
                 </div>
                 <div class="modal-footer">
-                    <form action="{{ route('voyager.bread.delete', ['id' => null]) }}" id="delete_builder_form" method="POST">
+                    <form action="{{ route('voyager.bread.delete', '') }}" id="delete_builder_form" method="POST">
                         {{ method_field('DELETE') }}
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
                         <input type="submit" class="btn btn-danger" value="{{ __('voyager::bread.delete_bread_conf') }}">

diff --git a/resources/views/tools/database/index.blade.php b/resources/views/tools/database/index.blade.php
@@ -53,7 +53,7 @@ class="btn-sm btn-danger delete">
                                      {{ __('voyager::bread.delete_bread') }}
                                 </a>
                             @else
-                                <a href="{{ route('voyager.bread.create', ['name' => $table->name]) }}"
+                                <a href="{{ route('voyager.bread.create', $table->name) }}"
                                    class="btn-sm btn-default">
                                     <i class="voyager-plus"></i> {{ __('voyager::bread.add_bread') }}
                                 </a>