diff --git a/src/utils/common.js b/src/utils/common.js index b8f5a7bb1..c09b6b1dd 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -73,6 +73,9 @@ function cleanDateStr(d) { } export function toSafeLocalDateStr(d) { + if (d === '') { + return '' + } const date = safeDate(d) // let date_s = date.toLocaleString(getUserLang(), {hour12: false}); const date_s = date.toLocaleString(getUserLang(), { hourCycle: 'h23' }) diff --git a/src/views/users/User/UserDetail/UserApplicationsPermissionRules.vue b/src/views/users/User/UserDetail/UserApplicationsPermissionRules.vue index 2862d9de0..e4c601b2d 100644 --- a/src/views/users/User/UserDetail/UserApplicationsPermissionRules.vue +++ b/src/views/users/User/UserDetail/UserApplicationsPermissionRules.vue @@ -49,7 +49,9 @@ export default { }, actions: { formatterArgs: { - updateRoute: 'RemoteAppPermissionUpdate', + onUpdate: ({ row, col, cellValue }) => { + this.$router.push({ name: 'ApplicationPermissionUpdate', params: { id: cellValue }}) + }, performDelete: ({ row, col }) => { const id = row.id const url = `/api/v1/perms/application-permissions/${id}/?user_id=${this.object.id}&draw=1`