Refactor to use more laravel logic and improve compatibility with older PHP versions (#206)
* Fix @param namespaces for PHPDocs in ServerPolicy * Reduce permission check duplication in ServerPolicy This introduces a new checkPermission method to reduce code duplication when checking for permissions. * Simplify logic to list accessible servers for the user We can directly use the pluck function that laravel collections provide to simplify the logic. * Fix pagination issue when databases/servers exceed 20 Laravels strips out the currently selected tab (or any GET query for that matter) by default when using pagination. the appends() methods helps with keeping that information. * Refactor unnecessary array_merge calls We can just append to the array instead of constantly merging a new copy. * Fix accessing “API Access” on some versions of PHP The “new” word is reserved and should not be used as a method name. http://stackoverflow.com/questions/9575590/why-am-i-getting-an-unexpected-t-new-error-in-php * Fix revoking API keys on older versions of php (5.6) “string” was not a valid function argument type yet, so revoking keys results in an error on older installations. * Fix issues with API due to methods named “list” “list” is yet another reserved keyword in PHP and messes up older installations of PHP (5.6). This renames all methods named “list” to “lists”. The API route names are left untouched (e.g. still called “api.admin.users.list”). * Refactor and shorten some API logic Used laravel collection methods where applicable to directly transform the values instead of converting back and forth. This also removes some dead variables that were never used as well as getting rid of a n+1 problem in the Service API (loading service variables afterwards, not during the model creation). * Return model save status in repositories where applicable * Fix typo in ServicePolicy#powerStart * Apply StyleCI corrections
This commit is contained in:
parent
c3abb32c0c
commit
a85ac87ae8
21 changed files with 199 additions and 335 deletions
|
@ -50,4 +50,14 @@ class ServiceOptions extends Model
|
|||
protected $casts = [
|
||||
'parent_service' => 'integer',
|
||||
];
|
||||
|
||||
/**
|
||||
* Gets all variables associated with this service.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function variables()
|
||||
{
|
||||
return $this->hasMany(ServiceVariables::class, 'option_id');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -80,15 +80,8 @@ class Subuser extends Model
|
|||
*/
|
||||
public static function accessServers()
|
||||
{
|
||||
$access = [];
|
||||
|
||||
$union = self::select('server_id')->where('user_id', self::$user->id);
|
||||
$select = Server::select('id')->where('owner', self::$user->id)->union($union)->get();
|
||||
|
||||
foreach ($select as &$select) {
|
||||
$access = array_merge($access, [$select->id]);
|
||||
}
|
||||
|
||||
return $access;
|
||||
return Server::select('id')->where('owner', self::$user->id)->union($union)->pluck('id');
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue