fix issue with custom categories and add experimental notice

This commit is contained in:
Simon Vieille 2022-01-11 20:20:44 +01:00
parent 5d9dc804f8
commit 34b1c2809b
2 changed files with 2 additions and 2 deletions

View file

@ -95,7 +95,7 @@ class AppRepository
} }
foreach ($visibleApps as $id => $app) { foreach ($visibleApps as $id => $app) {
if (isset($appCategoriesCustom[$id]) && (isset($categoriesCustom[$id]) || isset($categories[$id]))) { if (isset($appCategoriesCustom[$id], $categories[$appCategoriesCustom[$id]])) {
$visibleApps[$id]['category'] = [$appCategoriesCustom[$id]]; $visibleApps[$id]['category'] = [$appCategoriesCustom[$id]];
} }
} }

View file

@ -497,7 +497,6 @@ $choicesSizes = [
<div> <div>
<label for="side-menu-opener"> <label for="side-menu-opener">
<?php p($l->t('Always displayed')); ?> <?php p($l->t('Always displayed')); ?>
<small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
</label> </label>
</div> </div>
<p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p> <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
@ -805,6 +804,7 @@ $choicesSizes = [
<div class="side-menu-setting-row"> <div class="side-menu-setting-row">
<div class="side-menu-setting-label"> <div class="side-menu-setting-label">
<?php p($l->t('Customize application categories')); ?> <?php p($l->t('Customize application categories')); ?>
<small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
</div> </div>
<div class="side-menu-setting-form"> <div class="side-menu-setting-form">
<a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_"> <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">