mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 02:55:58 +01:00 
			
		
		
		
	Categories refactor (#9257)
* feat: wip categories pagination * feat: add subCategoriesPerPage setting * feat: add load more sub categories button to category page * fix: openapi spec * feat: show sub categories left on category page hide button when no more categories left * breaking: rename categories to allCategories on /search categories contains the search results * fix: spec * refactor: remove cidsPerPage * fix: tests * feat: use component for subcategories * fix: prevent negative subCategoriesLeft * feat: new category filter/search WIP * feat: remove categories from /tag * fix: dont load all categories when showing move modal * feat: allow adding custom categories to list * breaking: dont load entire category tree on post queue removed unused code add hooks to filter/selector add options to filter/selector * feat: make selector modal work again * feat: replace old search module * fix: topic move selector * feat: dont load all categories on create category modal * fix: fix more categorySelectors * feat: dont load entire category tree on group details page * feat: dont load all categories on home page and user settings page * feat: add pagination to /user/:userslug/categories * fix: update schemas * fix: more tests * fix: test * feat: flags page, dont return entire category tree * fix: flag test * feat: categories manage page dont load all categories allow changing root category clear caches properly * fix: spec * feat: admins&mods page dont load all categories * fix: spec * fix: dont load all children when opening dropdown * fix: on search results dont return all children * refactor: pass all options, rename options.cids to options.selectedCids * fix: #9266 * fix: index 0 * fix: spec * feat: #9265, add setObjectBulk * refactor: shoter updateOrder * feat: selectors on categories/category * fix: tests and search filter * fix: category update test * feat: pagination on acp categories page show order in set order modal * fix: allow drag&drop on pages > 1 in /admin/manage/categories * fix: teasers for deep nested categories fix sub category display on /category page * fix: spec * refactor: use eslint-disable-next-line * refactor: shorter
This commit is contained in:
		
				
					committed by
					
						 GitHub
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							2cfab3678e
						
					
				
				
					commit
					47299ea587
				
			| @@ -4,6 +4,8 @@ const user = require('../../user'); | ||||
| const categories = require('../../categories'); | ||||
| const accountHelpers = require('./helpers'); | ||||
| const helpers = require('../helpers'); | ||||
| const pagination = require('../../pagination'); | ||||
| const meta = require('../../meta'); | ||||
|  | ||||
| const categoriesController = module.exports; | ||||
|  | ||||
| @@ -12,11 +14,18 @@ categoriesController.get = async function (req, res, next) { | ||||
| 	if (!userData) { | ||||
| 		return next(); | ||||
| 	} | ||||
| 	const [states, categoriesData] = await Promise.all([ | ||||
| 	const [states, allCategoriesData] = await Promise.all([ | ||||
| 		user.getCategoryWatchState(userData.uid), | ||||
| 		categories.buildForSelect(userData.uid, 'find', ['descriptionParsed', 'depth', 'slug']), | ||||
| 	]); | ||||
|  | ||||
| 	const pageCount = Math.max(1, Math.ceil(allCategoriesData.length / meta.config.categoriesPerPage)); | ||||
| 	const page = Math.min(parseInt(req.query.page, 10) || 1, pageCount); | ||||
| 	const start = Math.max(0, (page - 1) * meta.config.categoriesPerPage); | ||||
| 	const stop = start + meta.config.categoriesPerPage - 1; | ||||
| 	const categoriesData = allCategoriesData.slice(start, stop + 1); | ||||
|  | ||||
|  | ||||
| 	categoriesData.forEach(function (category) { | ||||
| 		if (category) { | ||||
| 			category.isIgnored = states[category.cid] === categories.watchStates.ignoring; | ||||
| @@ -30,5 +39,6 @@ categoriesController.get = async function (req, res, next) { | ||||
| 		{ text: userData.username, url: '/user/' + userData.userslug }, | ||||
| 		{ text: '[[pages:categories]]' }, | ||||
| 	]); | ||||
| 	userData.pagination = pagination.create(page, pageCount, req.query); | ||||
| 	res.render('account/categories', userData); | ||||
| }; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user