Fixes for saving a new system
This commit is contained in:
@@ -45,6 +45,7 @@ class SystemController extends Controller
|
||||
default: $o->pollmode = NULL;
|
||||
}
|
||||
|
||||
$o->active = (! is_null($x=$request->validated('active'))) && $x;
|
||||
$o->autohold = FALSE;
|
||||
$o->save();
|
||||
|
||||
@@ -60,7 +61,9 @@ class SystemController extends Controller
|
||||
$o->users()->detach();
|
||||
}
|
||||
|
||||
return redirect()->to('system');
|
||||
return redirect()
|
||||
->to('system/addedit/'.$o->id)
|
||||
->with('saved',TRUE);
|
||||
}
|
||||
|
||||
$o->load(['addresses.zone.domain','addresses.nodes_hub','addresses.system','sessions.domain','sessions.systems']);
|
||||
|
@@ -8,7 +8,6 @@ use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
use App\Classes\FTN\Packet;
|
||||
use App\Models\Setup;
|
||||
|
||||
class SystemRegisterRequest extends FormRequest
|
||||
{
|
||||
@@ -19,12 +18,10 @@ class SystemRegisterRequest extends FormRequest
|
||||
*/
|
||||
public function authorize(Request $request)
|
||||
{
|
||||
if (! $request->post())
|
||||
if (! $request->post() || (! $this->route('o')))
|
||||
return TRUE;
|
||||
|
||||
// Cannot claim this site
|
||||
if ($this->route('o')->id === Setup::findOrFail(config('app.id'))->system_id)
|
||||
return FALSE;
|
||||
// @todo Also disallow claiming this hosts system
|
||||
|
||||
return Gate::allows($this->route('o')->users->count() ? 'update_nn' : 'register',$this->route('o'));
|
||||
}
|
||||
|
Reference in New Issue
Block a user