Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update file manager to account for new API error responses

Browse source
This commit is contained in:
Dane Everitt 2017-12-31 10:39:07 -06:00
parent 46d7ba7585
commit 8a38a8af4a
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Server/Files/RemoteRequestController.php
View file

@ -71,7 +71,7 @@ class RemoteRequestController extends Controller
->setAccessToken($request->attributes->get('server_token')) ->setAccessToken($request->attributes->get('server_token'))
->getDirectory($requestDirectory); ->getDirectory($requestDirectory);
} catch (RequestException $exception) { } catch (RequestException $exception) {
throw new DaemonConnectionException($exception); throw new DaemonConnectionException($exception, true);
} }
return view('server.files.list', [ return view('server.files.list', [

2
public/themes/pterodactyl/js/frontend/files/filemanager.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
View file

File diff suppressed because one or more lines are too long

2
public/themes/pterodactyl/js/frontend/files/src/index.js
View file

@ -71,7 +71,7 @@ class FileManager {
swal({ swal({
type: 'error', type: 'error',
title: 'File Error', title: 'File Error',
text: jqXHR.responseJSON.error || 'An error occured while attempting to process this request. Please try again.', text: jqXHR.responseJSON.errors[0].detail || 'An error occured while attempting to process this request. Please try again.',
}); });
console.error(jqXHR); console.error(jqXHR);
}); });