Merge branch 'develop' into feature/react-admin
This commit is contained in:
commit
bc4e28578d
24 changed files with 356 additions and 165 deletions
|
@ -56,7 +56,7 @@ class Allocation extends Model
|
|||
public static $validationRules = [
|
||||
'node_id' => 'required|exists:nodes,id',
|
||||
'ip' => 'required|ip',
|
||||
'port' => 'required|numeric|between:1024,65553',
|
||||
'port' => 'required|numeric|between:1024,65535',
|
||||
'ip_alias' => 'nullable|string',
|
||||
'server_id' => 'nullable|exists:servers,id',
|
||||
'notes' => 'nullable|string|max:256',
|
||||
|
|
|
@ -107,7 +107,7 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
|
|||
public function assignUserToDatabase(string $database, string $username, string $remote): bool
|
||||
{
|
||||
return $this->run(sprintf(
|
||||
'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, INDEX, LOCK TABLES, CREATE ROUTINE, ALTER ROUTINE, EXECUTE ON `%s`.* TO `%s`@`%s`',
|
||||
'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, REFERENCES, INDEX, LOCK TABLES, CREATE ROUTINE, ALTER ROUTINE, EXECUTE ON `%s`.* TO `%s`@`%s`',
|
||||
$database,
|
||||
$username,
|
||||
$remote
|
||||
|
|
|
@ -50,7 +50,7 @@ class EggConfigurationService
|
|||
|
||||
return [
|
||||
'done' => is_string($done) ? [$done] : $done,
|
||||
'user_interaction' => Arr::get($startup, 'userInteraction') ?? Arr::get($startup, 'user_interaction') ?? [],
|
||||
'user_interaction' => [],
|
||||
'strip_ansi' => Arr::get($startup, 'strip_ansi') ?? false,
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue