Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/apps/dashboard/crud/dashboard_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ def load_resource(session: SessionDep, dashboard: QueryDashboard):
sql = text("""
SELECT cd.*,
creator.name AS create_name,
updator.name AS update_name
updater.name AS update_name
FROM core_dashboard cd
LEFT JOIN sys_user creator ON cd.create_by = creator.id::varchar
LEFT JOIN sys_user updator
ON cd.update_by = updator.id:: varchar
LEFT JOIN sys_user updater
ON cd.update_by = updater.id:: varchar
WHERE cd.id = :dashboard_id
""")
result = session.execute(sql, {"dashboard_id": dashboard.id}).mappings().first()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"creator": "Creator",
"dashboard_id": "Dashboard ID",
"create_time": "Create Time",
"updator": "Updater",
"updater": "Updater",
"update_time": "Update Time",
"edit": "Edit",
"edit_title": "Edit Title",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/i18n/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"creator": "생성자",
"dashboard_id": "대시보드 ID",
"create_time": "생성 시간",
"updator": "업데이트자",
"updater": "업데이트자",
"update_time": "업데이트 시간",
"edit": "편집",
"edit_title": "제목 편집",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/i18n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"creator": "创建人",
"dashboard_id": "仪表板ID",
"create_time": "创建时间",
"updator": "更新人",
"updater": "更新人",
"update_time": "更新时间",
"edit": "编辑",
"edit_title": "编辑标题",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div v-if="dashboardInfo.createName" class="info-content">{{ dashboardInfo.createName }}</div>
<div class="info-title">{{ t('dashboard.create_time') }}</div>
<div class="info-content">{{ timestampFormatDate(dashboardInfo.createTime) }}</div>
<div v-if="dashboardInfo.updateName" class="info-title">{{ t('dashboard.updator') }}</div>
<div v-if="dashboardInfo.updateName" class="info-title">{{ t('dashboard.updater') }}</div>
<div v-if="dashboardInfo.updateName" class="info-content">{{ dashboardInfo.updateName }}</div>
<div class="info-title">{{ t('dashboard.update_time') }}</div>
<div v-if="dashboardInfo.updateTime" class="info-content">
Expand Down