Skip to content

Commit bd7b325

Browse files
authored
Merge pull request #7 from queents/dev
fix media process on edit
2 parents 54b3b9c + 2011953 commit bd7b325

File tree

11 files changed

+52
-5
lines changed

11 files changed

+52
-5
lines changed

.DS_Store

8 KB
Binary file not shown.

Database/.DS_Store

6 KB
Binary file not shown.

Providers/BaseServiceProvider.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class BaseServiceProvider extends ServiceProvider
2929
*/
3030
public function boot()
3131
{
32-
VILT::registerMenu(Menu::make('Dashboard')->label('global.dashboard')->icon('bx bx-home')->route('dashboard')->sort(0));
3332
VILT::registerMenu(Menu::make('Profile')->label('global.profile')->icon('bx bxs-user')->key('profile')->route('profile.show'));
3433
$this->registerConfig();
3534
$this->loadViewsFrom(module_path($this->moduleName, 'Resources/views'), 'base');

Services/.DS_Store

6 KB
Binary file not shown.

Services/Concerns/HasResource.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
namespace Modules\Base\Services\Concerns;
4+
5+
trait HasResource
6+
{
7+
/**
8+
* @var ?array
9+
* @example 'groupId'
10+
*/
11+
public ?array $resource = null;
12+
13+
/**
14+
* @param ?string $resource
15+
* @return $this
16+
*/
17+
public function resource(?string $resource): static
18+
{
19+
$data = app($resource)->query(request(), $this->rows, false);
20+
$this->resource = app($resource)->response($this->rows, $data, app($resource)->table);
21+
return $this;
22+
}
23+
}

Services/Resource/Concerns/Pages/Create.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ public function create(Request $request): \Inertia\Response
2222
$rows = $this->rows();
2323
return Render::make(ucfirst(Str::camel($this->table)).'/Create')->module($this->module)->data([
2424
"rows" => $rows,
25-
"url" => $this->table
25+
"url" => $this->table,
26+
"trans" => $this->loadTranslations()
2627
])->render();
2728
}
2829
}

Services/Resource/Concerns/Pages/Edit.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ public function edit(Request $request, $id): \Inertia\Response
9999
return Render::make(ucfirst(Str::camel($this->table)).'/Edit')->module($this->module)->data([
100100
"rows" => $rows,
101101
"record" => $record,
102-
"url" => $this->table
102+
"url" => $this->table,
103+
"trans" => $this->loadTranslations()
103104
])->render();
104105
}
105106
}

Services/Resource/Concerns/Pages/View.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ public function view(Request $request, $id){
9898
return Render::make(ucfirst(Str::camel($this->table)).'/View')->module($this->module)->data([
9999
"rows" => $rows,
100100
"record" => $record,
101-
"url" => $this->table
101+
"url" => $this->table,
102+
"trans" => $this->loadTranslations()
102103
])->render();
103104
}
104105
}

Services/Resource/Concerns/Process/Media.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function processMediaOnUpdate(Request $request, $record): void
6565
}
6666
}
6767
}
68-
else if(empty($request->get($field->name))){
68+
else if($field->edit && empty($request->get($field->name))){
6969
$record->clearMediaCollection($field->name);
7070
}
7171
}

Services/Rows/RelationManager.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
namespace Modules\Base\Services\Rows;
4+
5+
use Modules\Base\Services\Concerns\HasResource;
6+
use Modules\Base\Services\Rows\Abstracts\Base;
7+
8+
class RelationManager extends Base
9+
{
10+
use HasResource;
11+
12+
public string $vue = "ViltRelationManager.vue";
13+
14+
/**
15+
* @param string $name
16+
* @return static
17+
*/
18+
public static function make(string $name): self
19+
{
20+
return (new self)->name($name);
21+
}
22+
}

0 commit comments

Comments
 (0)