Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/Http/Controllers/Admin/CaveCrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class CaveCrudController extends CrudController
use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }

/**
* Configure the CrudPanel object. Apply settings to all operations.
Expand Down Expand Up @@ -147,4 +148,15 @@ public static function getMonsterSubfields()

return $subfields;
}

public function ajaxUpload()
{
if (app('env') === 'production') {
return response()->json(['errors' => [
'message' => 'Uploads are disabled in production.',
]], 500);
}

return $this->traitAjaxUpload();
}
}
12 changes: 12 additions & 0 deletions app/Http/Controllers/Admin/DummyCrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class DummyCrudController extends CrudController
use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\FetchOperation;
use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }

public function setup()
{
Expand Down Expand Up @@ -186,4 +187,15 @@ protected function groups()

return $groups;
}

public function ajaxUpload()
{
if (app('env') === 'production') {
return response()->json(['errors' => [
'message' => 'Uploads are disabled in production.',
]], 500);
}

return $this->traitAjaxUpload();
}
}
6 changes: 3 additions & 3 deletions app/Http/Controllers/Admin/ProductCrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ProductCrudController extends CrudController
use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\InlineCreateOperation;
use \Backpack\Pro\Http\Controllers\Operations\DropzoneOperation { dropzoneUpload as traitDropzoneUpload; }
use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }

public function setup()
{
Expand Down Expand Up @@ -292,7 +292,7 @@ protected function setupUpdateOperation()
$this->setupCreateOperation();
}

public function dropzoneUpload()
public function ajaxUpload()
{
if (app('env') === 'production') {
return response()->json(['errors' => [
Expand All @@ -301,6 +301,6 @@ public function dropzoneUpload()
], 500);
}

return $this->traitDropzoneUpload();
return $this->traitAjaxUpload();
}
}
12 changes: 12 additions & 0 deletions app/Http/Controllers/Admin/StoryCrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class StoryCrudController extends CrudController
use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }

/**
* Configure the CrudPanel object. Apply settings to all operations.
Expand Down Expand Up @@ -80,4 +81,15 @@ public static function getMonsterSubfields()
{
return CaveCrudController::getMonsterSubfields();
}

public function ajaxUpload()
{
if (app('env') === 'production') {
return response()->json(['errors' => [
'message' => 'This operation is not available in production.',
]], 500);
}

return $this->traitAjaxUpload();
}
}
8 changes: 5 additions & 3 deletions app/Http/Requests/CaveRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ public function authorize()
public function rules()
{
return [
'name' => 'required|string',
'monster.*.text' => 'required|string',
'name' => 'required|string',
'monster.*.text' => 'required|string',
'monster.*.status' => 'required',
];
}

Expand All @@ -50,7 +51,8 @@ public function attributes()
public function messages()
{
return [
//
'monster.*.text.required' => 'The "Monster > Text" field is required.',
'monster.*.status.required' => 'The "Monster > Status" field is required.',
];
}
}
4 changes: 3 additions & 1 deletion app/Http/Requests/DummyRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ public function attributes()
public function messages()
{
return [
//
'simple.*.text.required' => 'The "Simple > Text" field is required.',
'simple.*.text.min' => 'The "Simple > Text" field must be at least :min characters long.',
'simple.*.email.required' => 'The "Simple > Email" field is required.',
];
}
}
8 changes: 5 additions & 3 deletions app/Http/Requests/StoryRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ public function authorize()
public function rules()
{
return [
'name' => 'required|string',
'monsters.*.text' => 'required|string',
'name' => 'required|string',
'monsters.*.text' => 'required|string',
'monsters.*.status' => 'required',
];
}

Expand All @@ -50,7 +51,8 @@ public function attributes()
public function messages()
{
return [
//
'monsters.*.text.required' => 'The "Monsters > Text" field is required.',
'monsters.*.status.required' => 'The "Monsters > Status" field is required.',
];
}
}
4 changes: 2 additions & 2 deletions app/PageTemplates.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private function services()
$this->crud->addField([
'name' => 'content',
'label' => 'Content',
'type' => 'wysiwyg',
'type' => 'summernote',
'placeholder' => 'Your content here',
]);
}
Expand All @@ -64,7 +64,7 @@ private function about_us()
$this->crud->addField([
'name' => 'content',
'label' => 'Content',
'type' => 'wysiwyg',
'type' => 'summernote',
'placeholder' => 'Your content here',
]);
}
Expand Down
Loading