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/api-v1

Browse source
This commit is contained in:
Dane Everitt 2018-01-21 14:31:32 -06:00
commit 8dcab927e5
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
10 changed files with 41 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Repositories/Daemon/FileRepository.php
View file

@ -33,11 +33,11 @@ class FileRepository extends BaseRepository implements FileRepositoryInterface
* Return the contents of a given file if it can be edited in the Panel.
*
* @param string $path
* @return \stdClass
* @return string
*
* @throws \GuzzleHttp\Exception\RequestException
*/
public function getContent(string $path): stdClass
public function getContent(string $path): string
{
$file = pathinfo($path);
$file['dirname'] = in_array($file['dirname'], ['.', './', '/']) ? null : trim($file['dirname'], '/') . '/';

2
app/Repositories/Eloquent/NodeRepository.php
View file

@ -65,7 +65,7 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
$instance = $this->getBuilder()->with('location')->withCount('servers');
if ($this->hasSearchTerm()) {
$instance->setSearchTerm($this->getSearchTerm());
$instance->search($this->getSearchTerm());
}
return $instance->paginate(25, $this->getColumns());