StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/PTDL-472

Browse source
This commit is contained in:
Dane Everitt 2017-06-25 15:36:39 -05:00
commit b7b046c044
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
24 changed files with 672 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Repositories/Old/VariableRepository.php
View file

@ -123,12 +123,11 @@ class VariableRepository
$variable = ServiceVariable::findOrFail($id);
$validator = Validator::make($data, [
'name' => 'sometimes|required|string|min:1|max:255',
'description' => 'sometimes|nullable|string',
'env_variable' => 'sometimes|required|regex:/^[\w]{1,255}$/',
'default_value' => 'string',
'name' => 'required|string|min:1|max:255',
'description' => 'nullable|string',
'env_variable' => 'required|regex:/^[\w]{1,255}$/',
'rules' => 'bail|required|string',
'options' => 'sometimes|required|array',
'rules' => 'bail|sometimes|required|string|min:1',
]);
// Ensure the default value is allowed by the rules provided.

5
app/Repositories/Old/old_ServerRepository.php
View file

@ -535,7 +535,7 @@ class old_ServerRepository
}
$newPorts = true;
$firstNewAllocation = (is_null($firstNewAllocation)) ? $model->id : $firstNewAllocation;
$firstNewAllocation = $firstNewAllocation ?? $model;
$model->update([
'server_id' => $server->id,
]);
@ -555,7 +555,8 @@ class old_ServerRepository
}
// New Allocation, set as the default.
$server->allocation_id = $firstNewAllocation;
$server->allocation_id = $firstNewAllocation->id;
$newBuild['default'] = ['ip' => $firstNewAllocation->ip, 'port' => $firstNewAllocation->port];
}
$newPorts = true;

4
app/Repositories/Old/old_UserRepository.php
View file

@ -151,6 +151,8 @@ class old_UserRepository
*/
public function delete($id)
{
$user = Models\User::findOrFail($id);
if (Models\Server::where('owner_id', $id)->count() > 0) {
throw new DisplayException('Cannot delete a user with active servers attached to thier account.');
}
@ -170,7 +172,7 @@ class old_UserRepository
$subuser->delete();
}
Models\User::destroy($id);
$user->delete();
DB::commit();
} catch (\Exception $ex) {
DB::rollBack();