Browse Source

fix(gui-v2): includeM2M display

pull/3257/head
Wing-Kam Wong 2 years ago
parent
commit
b67f96eeb8
  1. 3
      packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
  2. 15
      packages/nocodb/src/lib/meta/api/tableApis.ts

3
packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue

@ -32,8 +32,7 @@ async function loadTableList() {
isLoading = true isLoading = true
tables = await $api.project.modelVisibilityList(project.value?.id, { tables = await $api.project.modelVisibilityList(project.value?.id, {
// FIXME: type includeM2M: includeM2M.value,
includeM2M: includeM2M.value || '',
}) })
} catch (e) { } catch (e) {
console.error(e) console.error(e)

15
packages/nocodb/src/lib/meta/api/tableApis.ts

@ -77,14 +77,13 @@ export async function tableList(req: Request, res: Response<TableListType>) {
}) })
).filter((t) => tableViewMapping[t.id]); ).filter((t) => tableViewMapping[t.id]);
res // todo: pagination res.json(
.json( new PagedResponseImpl(
new PagedResponseImpl( req.query?.includeM2M === 'true'
req.query?.includeM2M ? tableList
? tableList : (tableList.filter((t) => !t.mm) as Model[])
: (tableList.filter((t) => !t.mm) as Model[]) )
) );
);
} }
export async function tableCreate(req: Request<any, any, TableReqType>, res) { export async function tableCreate(req: Request<any, any, TableReqType>, res) {

Loading…
Cancel
Save