vitormattos/side_menu
1
0
Fork 0
forked from deblan/side_menu
Code Pull requests Activity

add apps sorter is user side (fix #160)

Browse source
This commit is contained in:
Simon Vieille 2022-11-04 21:07:44 +01:00
commit 52d88771d9
Signed by untrusted user: deblan
GPG key ID: 579388D585F70417
6 changed files with 63 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/Controller/JsController.php
View file

@ -100,10 +100,12 @@ class JsController extends Controller
$useAvatar = $this->config->getAppValueBool('use-avatar', '0');
$isForced = $this->config->getAppValueBool('force', '0');
$addLogoLink = $this->config->getAppValueBool('add-logo-link', '1');
$appsOrder = $this->config->getAppValueArray('apps-order', '[]');
$avatar = null;
$settings = null;
if ($this->user) {
$userAppsOrder = $this->config->getUserValueArray($this->user, 'apps-order', '[]');
$userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
$userTopSideMenuApps = $this->config->getUserValueArray($this->user, 'top-side-menu-apps', '[]');
@ -115,6 +117,10 @@ class JsController extends Controller
$topSideMenuApps = $userTopSideMenuApps;
}
if (!empty($userAppsOrder) && !$isForced) {
$appsOrder = $userAppsOrder;
}
$userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
$userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');
@ -162,7 +168,7 @@ class JsController extends Controller
'side-with-categories' => $this->config->getAppValueBool('side-with-categories', '0'),
'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
'apps-order' => $this->config->getAppValueArray('apps-order', '[]'),
'apps-order' => $appsOrder,
'avatar' => $avatar,
'top-menu-apps' => $topMenuApps,
'top-side-menu-apps' => $topSideMenuApps,

2
lib/Controller/NavController.php
View file

@ -93,7 +93,7 @@ class NavController extends Controller
]);
}
$apps = $this->appRepository->getOrderedApps();
$apps = $this->appRepository->getOrderedApps($user);
$categoriesLabels = $this->categoryRepository->getOrderedCategories();
$hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
$isForced = $this->config->getAppValueBool('force', '0');

2
lib/Controller/PersonalSettingController.php
View file

@ -97,7 +97,7 @@ class PersonalSettingController extends Controller
}
}
if (in_array($name, ['top-menu-apps', 'top-side-menu-apps'])) {
if (in_array($name, ['top-menu-apps', 'top-side-menu-apps', 'apps-order'])) {
$doSave = true;
$data = json_decode($value, true);