mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-25 00:39:58 +01:00
feat: use category selector in category page
fix privilege shortcuts in group page after search
This commit is contained in:
@@ -11,7 +11,7 @@ categoriesController.get = async function (req, res, next) {
|
||||
const [categoryData, parent, allCategories] = await Promise.all([
|
||||
categories.getCategories([req.params.category_id], req.uid),
|
||||
categories.getParents([req.params.category_id]),
|
||||
categories.buildForSelectAll(['text', 'value']),
|
||||
categories.buildForSelectAll(),
|
||||
]);
|
||||
|
||||
const category = categoryData[0];
|
||||
@@ -22,9 +22,10 @@ categoriesController.get = async function (req, res, next) {
|
||||
category.parent = parent[0];
|
||||
allCategories.forEach(function (category) {
|
||||
if (category) {
|
||||
category.selected = parseInt(category.value, 10) === parseInt(req.params.category_id, 10);
|
||||
category.selected = parseInt(category.cid, 10) === parseInt(req.params.category_id, 10);
|
||||
}
|
||||
});
|
||||
const selectedCategory = allCategories.find(c => c.selected);
|
||||
|
||||
const data = await plugins.fireHook('filter:admin.category.get', {
|
||||
req: req,
|
||||
@@ -38,7 +39,8 @@ categoriesController.get = async function (req, res, next) {
|
||||
|
||||
res.render('admin/manage/category', {
|
||||
category: data.category,
|
||||
allCategories: data.allCategories,
|
||||
categories: data.allCategories,
|
||||
selectedCategory: selectedCategory,
|
||||
customClasses: data.customClasses,
|
||||
});
|
||||
};
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
<div class="category" data-cid="{category.cid}">
|
||||
<div class="row">
|
||||
<div class="col-md-3 pull-right">
|
||||
<select id="category-selector" class="form-control">
|
||||
<!-- BEGIN allCategories -->
|
||||
<option value="{allCategories.value}" <!-- IF allCategories.selected -->selected<!-- ENDIF allCategories.selected -->>{allCategories.text}</option>
|
||||
<!-- END allCategories -->
|
||||
</select>
|
||||
<!-- IMPORT partials/category-selector.tpl -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
">
|
||||
<i data-name="icon" value="{categories.icon}" class="fa {categories.icon}"></i>
|
||||
</div>
|
||||
<h5 class="category-header">{categories.name}</h5>
|
||||
<h5 class="category-header"><a href="{config.relative_path}/admin/manage/categories/{categories.cid}">{categories.name}</a></h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user