MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 06:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/api-v1

Browse Source 
# Conflicts:
#	app/Contracts/Repository/RepositoryInterface.php
#	app/Repositories/Eloquent/EloquentRepository.php
#	app/Services/Nodes/NodeUpdateService.php
#	tests/Unit/Services/Nodes/NodeUpdateServiceTest.php
This commit is contained in:
Dane Everitt
2018-01-10 20:55:22 -06:00
parent f32cee3ae5 bd238c7555
commit 800e2df6b2
187 changed files with 1878 additions and 3143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Nodes/NodeDeletionService.php
View File

@@ -63,7 +63,7 @@ class NodeDeletionService
$node = $node->id;
}
$servers = $this->serverRepository->withColumns('id')->findCountWhere([['node_id', '=', $node]]);
$servers = $this->serverRepository->setColumns('id')->findCountWhere([['node_id', '=', $node]]);
if ($servers > 0) {
throw new HasActiveServersException($this->translator->trans('exceptions.node.servers_attached'));
}

4
app/Services/Nodes/NodeUpdateService.php
View File

@@ -65,11 +65,11 @@ class NodeUpdateService
if ($this->getUpdatedModel()) {
$response = $this->repository->update($node->id, $data);
} else {
$response = $this->repository->withoutFresh()->update($node->id, $data);
$response = $this->repository->withoutFreshModel()->update($node->id, $data);
}
try {
$this->configRepository->setNode($node->id)->update();
$this->configRepository->setNode($node)->update();
} catch (RequestException $exception) {
throw new DaemonConnectionException($exception);
}