dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly handle error; don't overwrite laravel method

Browse Source
This commit is contained in:
Dane Everitt 2021-01-30 18:07:48 -08:00
parent 32fb21d0b7
commit f558bc880a
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/AuditLog.php
View File

@ -101,7 +101,7 @@ class AuditLog extends Model
*
* @return $this
*/
public static function factory(string $action, array $metadata, bool $isSystem = false)
public static function instance(string $action, array $metadata, bool $isSystem = false)
{
/** @var \Illuminate\Http\Request $request */
$request = Container::getInstance()->make('request');

2
app/Models/Server.php
View File

@ -336,7 +336,7 @@ class Server extends Model
*/
public function newAuditEvent(string $action, array $metadata = []): AuditLog
{
return AuditLog::factory($action, $metadata)->fill([
return AuditLog::instance($action, $metadata)->fill([
'server_id' => $this->id,
]);
}

3
resources/scripts/components/server/backups/BackupContextMenu.tsx
View File

@ -71,7 +71,8 @@ export default ({ backup }: Props) => {
console.error(error);
clearAndAddHttpError({ key: 'backups', error });
})
.then(() => setLoading(false));
.then(() => setLoading(false))
.then(() => setModal(''));
};
return (