Browse Source

Merge pull request #9419 from nocodb/nc-fix/showing-wrong-times-ago

Nc fix: showing wrong date joined time from now in project members tab & for editor and below role it showing current date as date joined
pull/9421/head
Ramesh Mane 3 months ago committed by GitHub
parent
commit
fc0f2cec90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      packages/nc-gui/utils/datetimeUtils.ts
  2. 2
      packages/nocodb/src/models/BaseUser.ts

4
packages/nc-gui/utils/datetimeUtils.ts

@ -49,5 +49,9 @@ export const timeAgo = (date: string) => {
if (months < 12) { if (months < 12) {
return `${months}mo ago` return `${months}mo ago`
} }
if (years < 1) {
return `1y ago`
}
return `${years}y ago` return `${years}y ago`
} }

2
packages/nocodb/src/models/BaseUser.ts

@ -181,7 +181,7 @@ export default class BaseUser {
let { list: baseUsers } = cachedList; let { list: baseUsers } = cachedList;
const { isNoneList } = cachedList; const { isNoneList } = cachedList;
const fullVersionCols = ['invite_token', 'created_at']; const fullVersionCols = ['invite_token'];
if (!isNoneList && !baseUsers.length) { if (!isNoneList && !baseUsers.length) {
const queryBuilder = ncMeta const queryBuilder = ncMeta

Loading…
Cancel
Save