Fix branch selection and handle missing service
This commit is contained in:
parent
744609e7e9
commit
7d754558b0
app
@ -95,7 +95,7 @@ class GithubPrivateRepository extends Component
|
|||||||
$this->loadBranchByPage();
|
$this->loadBranchByPage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->selected_branch_name = data_get($this->branches,'0.name');
|
$this->selected_branch_name = data_get($this->branches, '0.name', 'main');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function loadBranchByPage()
|
protected function loadBranchByPage()
|
||||||
|
@ -30,7 +30,10 @@ class Configuration extends Component
|
|||||||
{
|
{
|
||||||
$this->parameters = get_route_parameters();
|
$this->parameters = get_route_parameters();
|
||||||
$this->query = request()->query();
|
$this->query = request()->query();
|
||||||
$this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
|
$this->service = Service::whereUuid($this->parameters['service_uuid'])->first();
|
||||||
|
if (!$this->service) {
|
||||||
|
return redirect()->route('dashboard');
|
||||||
|
}
|
||||||
$this->applications = $this->service->applications->sort();
|
$this->applications = $this->service->applications->sort();
|
||||||
$this->databases = $this->service->databases->sort();
|
$this->databases = $this->service->databases->sort();
|
||||||
}
|
}
|
||||||
|
@ -1006,7 +1006,7 @@ class Application extends BaseModel
|
|||||||
if (!$composeFileContent) {
|
if (!$composeFileContent) {
|
||||||
$this->docker_compose_location = $initialDockerComposeLocation;
|
$this->docker_compose_location = $initialDockerComposeLocation;
|
||||||
$this->save();
|
$this->save();
|
||||||
throw new \Exception("Could not load base compose file from $workdir$composeFile");
|
throw new \RuntimeException("Could not load base compose file from $workdir$composeFile");
|
||||||
} else {
|
} else {
|
||||||
$this->docker_compose_raw = $composeFileContent;
|
$this->docker_compose_raw = $composeFileContent;
|
||||||
$this->save();
|
$this->save();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user