mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-29 12:40:40 +02:00
Code Issues Releases Wiki Activity

Fix admin

Browse Source
This commit is contained in:
Toby Zerner
2015-05-05 09:16:53 +09:30
parent 25daca8685
commit c4e18488b9
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
framework/core/src/Admin/Actions/IndexAction.php
View File

@@ -7,16 +7,14 @@ use Auth;
use Cookie;
use Config;
use View;
use DB;
use Flarum\Api\Request as ApiRequest;
class IndexAction extends Action
{
public function handle(Request $request, $params = [])
{
$config = [
'baseURL' => 'http://flarum.dev/admin',
'apiURL' => 'http://flarum.dev/api',
'forumTitle' => Config::get('flarum::forum_title', 'Flarum Demo Forum')
];
$config = DB::table('config')->whereIn('key', ['base_url', 'api_url', 'forum_title', 'welcome_title', 'welcome_message'])->lists('value', 'key');
$data = [];
$session = [];
$alert = Session::get('alert');
@@ -27,23 +25,35 @@ class IndexAction extends Action
'token' => Cookie::get('flarum_remember')
];
$response = $this->callAction('Flarum\Api\Actions\Users\ShowAction', ['id' => $user->id]);
$response = $response->getData();
$response = app('Flarum\Api\Actions\Users\ShowAction')
->handle(new ApiRequest(['id' => $user->id], $this->actor))
->content->toArray();
$data = [$response->data];
if (isset($response->included)) {
$data = array_merge($data, $response->included);
$data = [$response['data']];
if (isset($response['included'])) {
$data = array_merge($data, $response['included']);
}
}
return View::make('flarum.admin::index')
$view = View::make('flarum.admin::index')
->with('title', 'Administration - '.Config::get('flarum::forum_title', 'Flarum Demo Forum'))
->with('styles', app('flarum.admin.assetManager')->getCSSFiles())
->with('scripts', app('flarum.admin.assetManager')->getJSFiles())
->with('config', $config)
->with('layout', View::make('flarum.admin::admin'))
->with('layout', 'flarum.admin::admin')
->with('data', $data)
->with('session', $session)
->with('alert', $alert);
$assetManager = app('flarum.admin.assetManager');
$root = __DIR__.'/../../..';
$assetManager->addFile([
$root.'/js/admin/dist/app.js',
$root.'/less/admin/app.less'
]);
// event(new RenderView($view, $assetManager, $this));
return $view
->with('styles', $assetManager->getCSSFiles())
->with('scripts', $assetManager->getJSFiles());
}
}

7
framework/core/src/Admin/AdminServiceProvider.php
View File

@@ -16,13 +16,6 @@ class AdminServiceProvider extends ServiceProvider
$this->loadViewsFrom($root.'/views', 'flarum.admin');
$assetManager = $this->app['flarum.admin.assetManager'];
$assetManager->addFile([
$root.'/js/admin/dist/app.js',
$root.'/less/admin/app.less'
]);
$this->publishes([
$root.'/public/fonts' => public_path('flarum/fonts')
]);