Skip to content

Commit 7299bbc

Browse files
committed
Rollback last commit to make package work on 5.1 again
1 parent 09824bd commit 7299bbc

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"email": "[email protected]"
1212
}
1313
],
14-
"version": "0.5.0",
14+
"version": "0.5.1",
1515
"require": {
16-
"laravelcollective/html": "5.2.*",
16+
"illuminate/html": "5.0.@dev",
1717
"intervention/image": "^2.3",
1818
"yajra/laravel-datatables-oracle": "~5.0"
1919
},

src/QuickadminServiceProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ public function register()
6464
$this->app->make('Laraveldaily\Quickadmin\Builders\ViewsBuilder');
6565
$this->app->make('Laraveldaily\Quickadmin\Events\UserLoginEvents');
6666
// Register dependency packages
67-
$this->app->register('Collective\Html\HtmlServiceProvider');
67+
$this->app->register('Illuminate\Html\HtmlServiceProvider');
6868
$this->app->register('Intervention\Image\ImageServiceProvider');
6969
$this->app->register('yajra\Datatables\DatatablesServiceProvider');
7070
// Register dependancy aliases
7171
$loader = \Illuminate\Foundation\AliasLoader::getInstance();
72-
$loader->alias('HTML', 'Collective\Html\HtmlFacade');
73-
$loader->alias('Form', 'Collective\Html\FormFacade');
72+
$loader->alias('HTML', 'Illuminate\Html\HtmlFacade');
73+
$loader->alias('Form', 'Illuminate\Html\FormFacade');
7474
$loader->alias('Image', 'Intervention\Image\Facades\Image');
7575
$loader->alias('Datatables', 'yajra\Datatables\Datatables');
7676
}

src/routes.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
foreach ($menus as $menu) {
2020
switch ($menu->menu_type) {
2121
case 1:
22-
Route::post(strtolower($menu->name) . '/massDelete', [
22+
post(strtolower($menu->name) . '/massDelete', [
2323
'as' => config('quickadmin.route') . '.' . strtolower($menu->name) . '.massDelete',
2424
'uses' => 'Admin\\' . ucfirst(camel_case($menu->name)) . 'Controller@massDelete'
2525
]);
26-
Route::resource(strtolower($menu->name), 'Admin\\' . ucfirst(camel_case($menu->name)) . 'Controller');
26+
resource(strtolower($menu->name), 'Admin\\' . ucfirst(camel_case($menu->name)) . 'Controller');
2727
break;
2828
case 3:
2929
Route::controller(strtolower($menu->name),
@@ -109,7 +109,7 @@
109109
Route::group([
110110
'middleware' => 'role'
111111
], function () {
112-
Route::resource('users', 'UsersController');
112+
resource('users', 'UsersController');
113113
});
114114
// Authentication routes...
115115
Route::get('auth/login', 'Auth\AuthController@getLogin');

0 commit comments

Comments
 (0)