Browse Source

Load sidebar on dashboard

Signed-off-by: Julius Härtl <jus@bitgrid.net>
tags/v20.0.0beta1
Julius Härtl 3 years ago
parent
commit
d9dcd59ae1
No account linked to committer's email address

+ 6
- 4
apps/dashboard/lib/Controller/DashboardController.php View File

@@ -27,6 +27,7 @@ declare(strict_types=1);
namespace OCA\Dashboard\Controller;

use OCA\Dashboard\AppInfo\Application;
use OCA\Files\Event\LoadSidebar;
use OCA\Viewer\Event\LoadViewer;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
@@ -76,6 +77,11 @@ class DashboardController extends Controller {
* @return TemplateResponse
*/
public function index(): TemplateResponse {
$this->eventDispatcher->dispatchTyped(new LoadSidebar());
if (class_exists(LoadViewer::class)) {
$this->eventDispatcher->dispatchTyped(new LoadViewer());
}

$this->eventDispatcher->dispatchTyped(new RegisterWidgetEvent($this->dashboardManager));

$userLayout = explode(',', $this->config->getUserValue($this->userId, 'dashboard', 'layout', 'recommendations,spreed,mail,calendar'));
@@ -92,10 +98,6 @@ class DashboardController extends Controller {
$this->inititalStateService->provideInitialState('dashboard', 'firstRun', $this->config->getUserValue($this->userId, 'dashboard', 'firstRun', '1') === '1');
$this->config->setUserValue($this->userId, 'dashboard', 'firstRun', '0');

if (class_exists(LoadViewer::class)) {
$this->eventDispatcher->dispatchTyped(new LoadViewer());
}

return new TemplateResponse('dashboard', 'index');
}


+ 4
- 1
apps/dashboard/src/main.js View File

@@ -3,8 +3,11 @@ import App from './App.vue'
import { translate as t } from '@nextcloud/l10n'
Vue.prototype.t = t

// FIXME workaround to make the sidebar work
Object.assign(window.OCA.Files, { App: { fileList: { filesClient: OC.Files.getClient() } } }, window.OCA.Files)

const Dashboard = Vue.extend(App)
const Instance = new Dashboard({}).$mount('#app')
const Instance = new Dashboard({}).$mount('#app-content-vue')

window.OCA.Dashboard = {
register: (app, callback) => Instance.register(app, callback),

+ 1
- 1
apps/dashboard/templates/index.php View File

@@ -1,4 +1,4 @@
<?php
\OCP\Util::addScript('dashboard', 'dashboard');
?>
<div id="app"></div>
<div id="app-content-vue"></div>

Loading…
Cancel
Save