@@ -138,11 +138,11 @@ |
||
138 | 138 | } elseif ($typeData == 'date') { |
139 | 139 | $type = 'date'; |
140 | 140 | $validation[] = "date"; |
141 | - $options = ['php_format' => 'M, d Y', 'datepicker_format' => 'M, dd YYYY',]; |
|
141 | + $options = ['php_format' => 'M, d Y', 'datepicker_format' => 'M, dd YYYY', ]; |
|
142 | 142 | } elseif ($typeData == 'datetime' || $typeData == 'timestamp') { |
143 | 143 | $type = 'datetime'; |
144 | 144 | $validation[] = "date_format:Y-m-d H:i:s"; |
145 | - $options = ['php_format' => 'M, d Y H:i',]; |
|
145 | + $options = ['php_format' => 'M, d Y H:i', ]; |
|
146 | 146 | } elseif ($typeData == 'time') { |
147 | 147 | $type = 'time'; |
148 | 148 | $validation[] = 'date_format:H:i:s'; |
@@ -15,7 +15,7 @@ |
||
15 | 15 | public function boot() |
16 | 16 | { |
17 | 17 | $this->app['view']->addNamespace('CbModulesGen', __DIR__.'/views'); |
18 | - $this->loadRoutesFrom( __DIR__.'/module_generator_routes.php'); |
|
18 | + $this->loadRoutesFrom(__DIR__.'/module_generator_routes.php'); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | /** |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | 'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBSuperadmin::class], |
7 | 7 | 'prefix' => cbAdminPath(), |
8 | 8 | 'namespace' => $namespace, |
9 | -], function () use ($namespace) { |
|
9 | +], function() use ($namespace) { |
|
10 | 10 | Route::get('modules/', ['uses' => 'AdminModulesController@getIndex', 'as' => 'AdminModulesControllerGetIndex']); |
11 | 11 | Route::get('modules/test', ['uses' => 'AdminModulesController@getTest', 'as' => 'AdminModulesControllerGetTest']); |
12 | 12 | Route::get('modules/export-data', ['uses' => 'AdminModulesController@getExportData', 'as' => 'AdminModulesControllerGetExportData']); |
@@ -15,18 +15,18 @@ discard block |
||
15 | 15 | Route::get('modules/add', ['uses' => 'AdminModulesController@getAdd', 'as' => 'AdminModulesControllerGetAdd']); |
16 | 16 | |
17 | 17 | Route::get('modules/step1/{id?}', ['uses' => 'AdminModulesController@getStep1', 'as' => 'AdminModulesControllerGetStep1']); |
18 | - Route::post('modules/step2', ['uses' => 'AdminModulesController@postStep2', 'as' => 'AdminModulesControllerPostStep2',]); |
|
18 | + Route::post('modules/step2', ['uses' => 'AdminModulesController@postStep2', 'as' => 'AdminModulesControllerPostStep2', ]); |
|
19 | 19 | |
20 | 20 | Route::get('modules/step2/{id?}', ['uses' => 'AdminModulesController@getStep2', 'as' => 'AdminModulesControllerGetStep2']); |
21 | - Route::post('modules/step3', ['uses' => 'AdminModulesController@postStep3', 'as' => 'AdminModulesControllerPostStep3',]); |
|
21 | + Route::post('modules/step3', ['uses' => 'AdminModulesController@postStep3', 'as' => 'AdminModulesControllerPostStep3', ]); |
|
22 | 22 | |
23 | 23 | Route::get('modules/step3/{id?}', ['uses' => 'AdminModulesController@getStep3', 'as' => 'AdminModulesControllerGetStep3']); |
24 | - Route::post('modules/step4', ['uses' => 'AdminModulesController@postStep4', 'as' => 'AdminModulesControllerPostStep4',]); |
|
24 | + Route::post('modules/step4', ['uses' => 'AdminModulesController@postStep4', 'as' => 'AdminModulesControllerPostStep4', ]); |
|
25 | 25 | |
26 | 26 | Route::get('modules/type-info/{type?}', ['uses' => 'AdminModulesController@getTypeInfo', 'as' => 'AdminModulesControllerGetTypeInfo']); |
27 | 27 | |
28 | 28 | Route::get('modules/step4/{id?}', ['uses' => 'AdminModulesController@getStep4', 'as' => 'AdminModulesControllerGetStep4']); |
29 | - Route::post('modules/step-finish', ['uses' => 'AdminModulesController@postStepFinish', 'as' => 'AdminModulesControllerPostStepFinish',]); |
|
29 | + Route::post('modules/step-finish', ['uses' => 'AdminModulesController@postStepFinish', 'as' => 'AdminModulesControllerPostStepFinish', ]); |
|
30 | 30 | |
31 | 31 | Route::get('modules/delete-image', ['uses' => 'AdminModulesController@getDeleteImage', 'as' => 'AdminModulesControllerGetDeleteImage']); |
32 | 32 | Route::get('modules/data-query', ['uses' => 'AdminModulesController@getDataQuery', 'as' => 'AdminModulesControllerGetDataQuery']); |
@@ -38,16 +38,16 @@ discard block |
||
38 | 38 | Route::get('modules/detail/{id?}', ['uses' => 'AdminModulesController@getDetail', 'as' => 'AdminModulesControllerGetDetail']); |
39 | 39 | Route::get('modules/import-data', ['uses' => 'AdminModulesController@getImportData', 'as' => 'AdminModulesControllerGetImportData']); |
40 | 40 | |
41 | - Route::post('modules/add-save', ['uses' => 'AdminModulesController@postAddSave', 'as' => 'AdminModulesControllerPostAddSave',]); |
|
42 | - Route::post('modules/edit-save/{one?}', ['uses' => 'AdminModulesController@postEditSave', 'as' => 'AdminModulesControllerPostEditSave',]); |
|
43 | - Route::post('modules/export-data', ['uses' => 'AdminModulesController@postExportData', 'as' => 'AdminModulesControllerPostExportData',]); |
|
44 | - Route::post('modules/find-data', ['uses' => 'AdminModulesController@postFindData', 'as' => 'AdminModulesControllerPostFindData',]); |
|
41 | + Route::post('modules/add-save', ['uses' => 'AdminModulesController@postAddSave', 'as' => 'AdminModulesControllerPostAddSave', ]); |
|
42 | + Route::post('modules/edit-save/{one?}', ['uses' => 'AdminModulesController@postEditSave', 'as' => 'AdminModulesControllerPostEditSave', ]); |
|
43 | + Route::post('modules/export-data', ['uses' => 'AdminModulesController@postExportData', 'as' => 'AdminModulesControllerPostExportData', ]); |
|
44 | + Route::post('modules/find-data', ['uses' => 'AdminModulesController@postFindData', 'as' => 'AdminModulesControllerPostFindData', ]); |
|
45 | 45 | |
46 | 46 | //Route::post('modules/done-import', ['uses' => 'AdminModulesController@postDoneImport', 'as' => 'AdminModulesControllerPostDoneImport',]); |
47 | 47 | |
48 | - Route::post('modules/do-import-chunk', ['uses' => 'AdminModulesController@postDoImportChunk', 'as' => 'AdminModulesControllerPostDoImportChunk',]); |
|
48 | + Route::post('modules/do-import-chunk', ['uses' => 'AdminModulesController@postDoImportChunk', 'as' => 'AdminModulesControllerPostDoImportChunk', ]); |
|
49 | 49 | //Route::post('modules/do-upload-import-data', ['uses' => 'AdminModulesController@postDoUploadImportData', 'as' => 'AdminModulesControllerPostDoUploadImportData',]); |
50 | - Route::post('modules/action-selected', ['uses' => 'AdminModulesController@postActionSelected', 'as' => 'AdminModulesControllerPostActionSelected',]); |
|
50 | + Route::post('modules/action-selected', ['uses' => 'AdminModulesController@postActionSelected', 'as' => 'AdminModulesControllerPostActionSelected', ]); |
|
51 | 51 | //Route::post('modules/upload-summernote', ['uses' => 'AdminModulesController@postUploadSummernote', 'as' => 'AdminModulesControllerPostUploadSummernote',]); |
52 | 52 | //Route::post('modules/upload-file', ['uses' => 'AdminModulesController@postUploadFile', 'as' => 'AdminModulesControllerPostUploadFile',]); |
53 | 53 | }); |
54 | 54 | \ No newline at end of file |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | { |
17 | 17 | $this->table = 'cms_moduls'; |
18 | 18 | $this->primary_key = 'id'; |
19 | - $this->title_field = 'name' ; |
|
19 | + $this->title_field = 'name'; |
|
20 | 20 | $this->limit = 100; |
21 | 21 | $this->button_add = false; |
22 | 22 | $this->button_export = false; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $this->orderby = ['is_protected' => 'asc', 'name' => 'asc']; |
29 | 29 | |
30 | 30 | $this->col = []; |
31 | - $this->col[] = ['label' => 'name', 'name' => 'name' ]; |
|
31 | + $this->col[] = ['label' => 'name', 'name' => 'name']; |
|
32 | 32 | $this->col[] = ['label' => "Table", 'name' => "table_name"]; |
33 | 33 | $this->col[] = ['label' => "Path", 'name' => "path"]; |
34 | 34 | $this->col[] = ['label' => "Controller", 'name' => "controller"]; |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | $this->form[] = ['label' => 'Controller', 'name' => 'controller', 'type' => 'text', 'placeholder' => '(Optional) Auto Generated']; |
251 | 251 | |
252 | 252 | if (in_array(CRUDBooster::getCurrentMethod(), ['getAdd', 'postAddSave'])) { |
253 | - return ; |
|
253 | + return; |
|
254 | 254 | } |
255 | 255 | |
256 | 256 | $this->form[] = [ |
@@ -14,7 +14,7 @@ |
||
14 | 14 | public function boot() |
15 | 15 | { |
16 | 16 | $this->app['view']->addNamespace('CbFileManager', __DIR__.'/views'); |
17 | - $this->loadRoutesFrom( __DIR__.'/file_manager_routes.php'); |
|
17 | + $this->loadRoutesFrom(__DIR__.'/file_manager_routes.php'); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | /** |
@@ -109,7 +109,7 @@ |
||
109 | 109 | 'as' => 'AdminFileManagerControllerPostDoImportChunk', |
110 | 110 | ]); |
111 | 111 | |
112 | - /* Route::post('file-manager/do-upload-import-data', [ |
|
112 | + /* Route::post('file-manager/do-upload-import-data', [ |
|
113 | 113 | 'uses' => 'AdminFileManagerController@postDoUploadImportData', |
114 | 114 | 'as' => 'AdminFileManagerControllerPostDoUploadImportData', |
115 | 115 | ]);*/ |
@@ -6,7 +6,7 @@ |
||
6 | 6 | 'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBSuperadmin::class], |
7 | 7 | 'prefix' => cbAdminPath(), |
8 | 8 | 'namespace' => $namespace, |
9 | -], function () use ($namespace) { |
|
9 | +], function() use ($namespace) { |
|
10 | 10 | Route::get('file-manager/', ['uses' => 'AdminFileManagerController@getIndex', 'as' => 'AdminFileManagerControllerGetIndex']); |
11 | 11 | |
12 | 12 | Route::post('file-manager/create-directory/{one?}/{two?}/{three?}/{four?}/{five?}', [ |
@@ -47,14 +47,14 @@ |
||
47 | 47 | $allowedExtension = explode(',', strtolower(cbConfig('UPLOAD_TYPES'))); |
48 | 48 | $path = request('path') ? base64_decode(request('path')) : 'uploads'; |
49 | 49 | $file = Request::file('userfile'); |
50 | - if (! $file) { |
|
50 | + if (!$file) { |
|
51 | 51 | return null; |
52 | 52 | } |
53 | 53 | |
54 | 54 | $fileName = $file->getClientOriginalName(); |
55 | 55 | $isAllowed = in_array($file->getClientOriginalExtension(), $allowedExtension); |
56 | 56 | |
57 | - if (! $isAllowed) { |
|
57 | + if (!$isAllowed) { |
|
58 | 58 | backWithMsg('The file '.$fileName.' type is not allowed!', 'warning'); |
59 | 59 | } |
60 | 60 |
@@ -13,7 +13,7 @@ |
||
13 | 13 | @endif |
14 | 14 | |
15 | 15 | @if(CRUDBooster::canDelete() && $button_delete) |
16 | -<?php $url = CRUDBooster::mainpath("delete/".$row->$pk);?> |
|
16 | +<?php $url = CRUDBooster::mainpath("delete/".$row->$pk); ?> |
|
17 | 17 | <a class='btn btn-xs btn-warning btn-delete' title='{{cbTrans("action_delete_data")}}' href='javascript:;' |
18 | 18 | onclick='{{CRUDBooster::deleteConfirm($url)}}'> |
19 | 19 | {!! CB::icon('trash') !!} |
@@ -13,7 +13,7 @@ |
||
13 | 13 | @endif |
14 | 14 | |
15 | 15 | @if(CRUDBooster::canDelete() && $button_delete) |
16 | - <?php $url = CRUDBooster::mainpath("delete/".$row->$pk);?> |
|
16 | + <?php $url = CRUDBooster::mainpath("delete/".$row->$pk); ?> |
|
17 | 17 | <a class='btn btn-xs btn-warning btn-delete' title='{{cbTrans("action_delete_data")}}' href='javascript:;' |
18 | 18 | onclick='{{CRUDBooster::deleteConfirm($url)}}'> |
19 | 19 | {!! CB::icon('trash') !!} |