m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse Source
This commit is contained in:
Francis Cao 2023-10-13 12:53:08 -07:00
commit 170a269723
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/(main)/settings/users/UserWebsites.js
View File

@ -22,7 +22,7 @@ export function UserWebsites({ userId }) {
<Page loading={isLoading} error={error}>
{hasData && (
<WebsitesTable
data={data}
data={data.data}
onFilterChange={handleFilterChange}
onPageChange={handlePageChange}
onPageSizeChange={handlePageSizeChange}

12
src/pages/api/users/[id]/websites.ts
View File

@ -30,7 +30,15 @@ export default async (
await useValidate(schema, req, res);
const { user } = req.auth;
const { id: userId, page = 1, query = '', includeTeams, onlyTeams } = req.query;
const {
id: userId,
page = 1,
pageSize,
orderBy,
query = '',
includeTeams,
onlyTeams,
} = req.query;
if (req.method === 'GET') {
if (!user.isAdmin && user.id !== userId) {
@ -39,7 +47,9 @@ export default async (
const websites = await getWebsitesByUserId(userId, {
page,
pageSize,
query,
orderBy,
includeTeams,
onlyTeams,
});