deblan/side_menu
deblan/side_menu
3
6
Fork 5
Code Issues 6 Pull requests 11 Projects Releases 119 Wiki Activity

add add top-menu-apps option in the personal settings

Browse source
This commit is contained in:
Simon Vieille 2020-08-12 15:59:51 +02:00
parent 9d9afff08d
commit a1b1396b63
Signed by: deblan
GPG key ID: 03383D15A1D31745
6 changed files with 91 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/Controller/JsController.php
View file

@ -23,6 +23,8 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\Response;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IUserSession;
use OC;
class JsController extends Controller
{
@ -53,6 +55,17 @@ class JsController extends Controller
*/
public function script()
{
$user = OC::$server[IUserSession::class]->getUser();
$topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
if ($user) {
$userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
if (!empty($userTopMenuApps)) {
$topMenuApps = $userTopMenuApps;
}
}
$parameters = [
'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
@ -61,7 +74,7 @@ class JsController extends Controller
'hide-when-no-apps' => (bool) $this->config->getAppValue('side_menu', 'hide-when-no-apps', '0'),
'loader-enabled' => (bool) $this->config->getAppValue('side_menu', 'loader-enabled', '1'),
'big-menu' => (bool) $this->config->getAppValue('side_menu', 'big-menu', '0'),
'top-menu-apps' => (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true),
'top-menu-apps' => $topMenuApps,
];
$response = new TemplateResponse('side_menu', 'js/script', $parameters, 'blank');

14
lib/Controller/NavController.php
View file

@ -109,6 +109,13 @@ class NavController extends Controller
]);
}
$topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
$userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
if (!empty($userTopMenuApps)) {
$topMenuApps = $userTopMenuApps;
}
foreach ($categoriesLabels as $k => $category) {
$categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
@ -118,13 +125,14 @@ class NavController extends Controller
$categoriesLabels['external_links'] = $this->trans->t('External sites');
foreach ($apps as $app) {
if (in_array($app['id'], $topMenuApps)) {
continue;
}
$categories = (array) $app['category'];
$appsCategories[$app['id']] = [];
foreach ($categories as $category) {
if ($externalSitesInTopMenu && $category === 'external_links') {
continue;
}
if (!isset($items[$category])) {
$items[$category] = [

20
lib/Controller/PersonalSettingController.php
View file

@ -63,8 +63,28 @@ class PersonalSettingController extends Controller
}
}
if ($name === 'top-menu-apps') {
$doSave = true;
$data = json_decode($value, true);
if (!is_array($data)) {
$doSave = false;
} else {
foreach ($data as $v) {
if (!is_string($v)) {
$doSave = false;
}
}
}
}
if ($doSave) {
$this->config->setUserValue($user->getUid(), 'side_menu', $name, $value);
return [
'name' => $name,
'value' => $value,
];
}
return [];

11
lib/Settings/Personal.php
View file

@ -24,6 +24,7 @@ use OCP\ILogger;
use OCP\Settings\ISettings;
use OCP\IConfig;
use OCP\IUserSession;
use OCA\SideMenu\Service\AppRepository;
class Personal implements ISettings
{
@ -47,12 +48,18 @@ class Personal implements ISettings
*/
private $userSession;
public function __construct(IL10N $l, ILogger $logger, IConfig $config, IUserSession $userSession)
/**
* @var AppRepository
*/
private $appRepository;
public function __construct(IL10N $l, ILogger $logger, IConfig $config, IUserSession $userSession, AppRepository $appRepository)
{
$this->l = $l;
$this->logger = $logger;
$this->config = $config;
$this->userSession = $userSession;
$this->appRepository = $appRepository;
}
/**
@ -64,6 +71,8 @@ class Personal implements ISettings
$parameters = [
'enabled' => $this->config->getUserValue($user->getUid(), 'side_menu', 'enabled', '1'),
'top-menu-apps' => (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true),
'apps' => $this->appRepository->getVisibleApps(),
];
return new TemplateResponse('side_menu', 'settings/personal-form', $parameters, '');

2
templates/settings/admin-form.php
View file

@ -322,8 +322,6 @@ $choicesSizes = [
</label>
</div>
<p><em>Selected apps will be displayed in the <code>big menu</code> display and in the top menu.</em></p>
<div class="side-menu-setting" data-name="top-menu-apps" data-checkbox>
<?php foreach ($_['apps'] as $app): ?>
<div>

36
templates/settings/personal-form.php
View file

@ -53,6 +53,42 @@ $choicesYesNo = [
</div>
</div>
<div class="section">
<h2>
<?php p($l->t('Top menu')); ?>
</h2>
<div>
<label for="side-menu-top-menu-apps">
<?php p($l->t('Apps that not must be moved in the side menu')); ?>
<small><span class="warning">Experimental</span></small>
</label>
</div>
<p>
<em>
If there is no selection then the global configuration is applied.
</em>
</p>
<div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal>
<?php foreach ($_['apps'] as $app): ?>
<div>
<input
type="checkbox"
name="top-menu-apps[]"
value="<?php echo $app['id'] ?>"
id="top-menu-app-<?php echo $app['id'] ?>"
<?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
/>
<label for="top-menu-app-<?php echo $app['id'] ?>">
<?php echo $app['name'] ?>
</label>
</div>
<?php endforeach; ?>
</div>
</div>
<div class="section">
<button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>