bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Enhance the system link/register selection

Browse Source
This commit is contained in:
Deon George
2023-10-05 11:11:21 +11:00
parent 32c0088339
commit 495a27cfed
3 changed files with 40 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -826,11 +826,11 @@ class SystemController extends Controller
if ($request->isMethod('GET'))
return view('user.system.register');
if ($request->action === 'register' && $request->system_id)
if ($request->action === 'register' && $request->name && is_numeric($request->name))
return view('user.system.widget.register_confirm')
->with('o',System::findOrFail($request->system_id));
->with('o',System::findOrFail($request->name));
$o = System::findOrNew($request->system_id);
$o = System::findOrNew(is_numeric($request->system_id) ? $request->system_id : NULL);
// If the system exists, and we are 'register', we'll start the address claim process
if ($o->exists && $request->action === 'Link') {

14
app/Http/Requests/SystemRegister.php
View File

@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Gate;
use Illuminate\Validation\Rule;
use App\Classes\FTN\Packet;
use App\Models\System;
use App\Models\{Setup,System};
// @todo rename to SystemRegisterRequest
class SystemRegister extends FormRequest
@@ -22,9 +22,17 @@ class SystemRegister extends FormRequest
*/
public function authorize(Request $request)
{
$this->so = System::findOrNew($request->system_id);
$this->so = new System;
return Gate::allows($this->so->users->count() ? 'update' : 'register',$this->so);
if (is_numeric($request->name)) {
$this->so = System::findOrNew($request->name);
// Cannot claim this site
if ($this->so->id === Setup::findOrFail(config('app.id'))->system_id)
return FALSE;
}
return Gate::allows(is_numeric($request->name) && $this->so->users->count() ? 'update' : 'register',$this->so);
}
public function messages(): array