matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix custom domain setting + fix maxFileSize preview

Browse Source
This commit is contained in:
Julien Nahum
2024-01-22 14:28:22 +01:00
parent ff701fe433
commit c0f01f4b84
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/WorkspaceController.php
View File

@@ -2,8 +2,8 @@
namespace App\Http\Controllers;
use App\Http\Controllers\Controller;
use App\Http\Requests\Workspace\CustomDomainRequest;
use App\Http\Resources\WorkspaceResource;
use App\Models\Workspace;
use Illuminate\Http\Request;
use App\Service\WorkspaceHelper;
@@ -19,7 +19,7 @@ class WorkspaceController extends Controller
public function index()
{
$this->authorize('viewAny', Workspace::class);
return Auth::user()->workspaces;
return WorkspaceResource::collection(Auth::user()->workspaces);
}
public function listUsers(Request $request, $workspaceId)
@@ -34,7 +34,7 @@ class WorkspaceController extends Controller
{
$request->workspace->custom_domains = $request->customDomains;
$request->workspace->save();
return $request->workspace;
return new WorkspaceResource($request->workspace);
}
public function delete($id)

12
app/Http/Resources/WorkspaceResource.php
View File

@@ -7,18 +7,18 @@ use Illuminate\Support\Facades\Auth;
class WorkspaceResource extends JsonResource
{
public static $wrap = null;
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return array
*/
public function toArray($request)
{
return [
'id' => $this->id,
'is_enterprise' => $this->is_enterprise,
'is_pro' => $this->is_pro,
];
return array_merge(parent::toArray($request), [
'max_file_size' => $this->max_file_size / 1000000,
]);
}
}