Skip to content

Commit 79ed2ff

Browse files
authored
Merge pull request #594 from Dajeong-Park/total-diplo
[Mold] User 계정인 경우 이벤트 항목 조회되지 않는 오류 수정, cloudstack 문구 변경, 이벤트 관련 문구 추가
2 parents 0655ae2 + 39b343f commit 79ed2ff

File tree

4 files changed

+32
-14
lines changed

4 files changed

+32
-14
lines changed

ui/public/config.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,20 @@
6868
"links": [
6969
{
7070
"title": "Documentation",
71-
"text": "CloudStack documentation website",
72-
"link": "https://docs.cloudstack.apache.org/en/latest/",
71+
"text": "ABLESTACK documentation website",
72+
"link": "http://docs.ablecloud.io/latest",
7373
"icon": "read-outlined"
7474
},
75-
{
76-
"title": "API Documentation",
77-
"text": "Refer to API documentation",
78-
"link": "https://cloudstack.apache.org/api.html",
79-
"icon": "api-outlined"
80-
},
8175
{
8276
"title": "Email Support",
83-
"text": "Join CloudStack users mailing list to seek and provide support",
84-
"link": "mailto:[email protected]",
77+
"text": "Join ABLESTACK users mailing list to seek and provide support",
78+
"link": "mailto:[email protected]",
8579
"icon": "mail-outlined"
8680
},
8781
{
8882
"title": "Report Issue",
8983
"text": "Submit a bug or improvement request",
90-
"link": "https://github.com/apache/cloudstack/issues/new",
84+
"link": "https://github.com/ablecloud-team/ablestack-cloud/issues/new",
9185
"icon": "bug-outlined"
9286
}
9387
]

ui/public/locales/en.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4530,6 +4530,16 @@
45304530
"iso.direct.download.failure": "ISO.DIRECT.DOWNLOAD.FAILURE",
45314531
"system.vm.diagnostics": "SYSTEM.VM.DIAGNOSTICS",
45324532
"system.rolling.maintenance": "SYSTEM.ROLLING.MAINTENANCE",
4533+
"sharedfs.create": "SHAREDFS.CREATE",
4534+
"sharedfs.start": "SHAREDFS.START",
4535+
"sharedfs.update": "SHAREDFS.UPDATE",
4536+
"sharedfs.change.service.offering": "SHAREDFS.CHANGE.SERVICE.OFFERING",
4537+
"sharedfs.change.disk.offering": "SHAREDFS.CHANGE.DISK.OFFERING",
4538+
"sharedfs.stop": "SHAREDFS.STOP",
4539+
"sharedfs.restart": "SHAREDFS.RESTART",
4540+
"sharedfs.destroy": "SHAREDFS.DESTROY",
4541+
"sharedfs.expunge": "SHAREDFS.EXPUNGE",
4542+
"sharedfs.recover": "SHAREDFS.RECOVER",
45334543
"host.rolling.maintenance": "HOST.ROLLING.MAINTENANCE",
45344544
"cluster.rolling.maintenance": "CLUSTER.ROLLING.MAINTENANCE",
45354545
"pod.rolling.maintenance": "POD.ROLLING.MAINTENANCE",

ui/public/locales/ko_KR.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4530,6 +4530,16 @@
45304530
"iso.direct.download.failure": "ISO.\uc9c1\uc811.\ub2e4\uc6b4\ub85c\ub4dc.\uc2e4\ud328",
45314531
"system.vm.diagnostics": "\uc2dc\uc2a4\ud15c.VM.\uc9c4\ub2e8",
45324532
"system.rolling.maintenance": "\uc2dc\uc2a4\ud15c.\ub864\ub9c1.\uc720\uc9c0\ubcf4\uc218",
4533+
"sharedfs.create": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc0dd\uc131",
4534+
"sharedfs.start": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc7ac\uc2dc\uc791",
4535+
"sharedfs.update": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc5c5\ub370\uc774\ud2b8",
4536+
"sharedfs.change.service.offering": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc11c\ube44\uc2a4.\uc624\ud37c\ub9c1.\ubcc0\uacbd",
4537+
"sharedfs.change.disk.offering": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\ub514\uc2a4\ud06c.\uc624\ud37c\ub9c1.\ubcc0\uacbd",
4538+
"sharedfs.stop": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc815\uc9c0",
4539+
"sharedfs.restart": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc2dc\uc791",
4540+
"sharedfs.destroy": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\ud30c\uae30",
4541+
"sharedfs.expunge": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc0ad\uc81c",
4542+
"sharedfs.recover": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\ubcf5\uad6c",
45334543
"host.rolling.maintenance": "\ud638\uc2a4\ud2b8.\ub864\ub9c1.\uc720\uc9c0\ubcf4\uc218",
45344544
"cluster.rolling.maintenance": "\ud074\ub7ec\uc2a4\ud130.\ub864\ub9c1.\uc720\uc9c0\ubcf4\uc218",
45354545
"pod.rolling.maintenance": "POD.\ub864\ub9c1.\uc720\uc9c0\ubcf4\uc218",

ui/src/components/view/EventSidebar.vue

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,13 @@ export default {
161161
listall: true
162162
}
163163
try {
164-
const settingsResponse = await api('listConfigurations', { name: 'event.recent.minutes' })
165-
const eventListBarSetting = settingsResponse?.listconfigurationsresponse?.configuration[0]?.value || 5
166-
this.eventListBarMinutes = parseInt(eventListBarSetting, 10) * 60 * 1000
164+
if (this.$store.getters.userInfo.roletype === 'Admin') {
165+
const settingsResponse = await api('listConfigurations', { name: 'event.recent.minutes' })
166+
const eventListBarSetting = settingsResponse?.listconfigurationsresponse?.configuration[0]?.value || 5
167+
this.eventListBarMinutes = parseInt(eventListBarSetting, 10) * 60 * 1000
168+
} else {
169+
this.eventListBarMinutes = parseInt(5, 10) * 60 * 1000
170+
}
167171
const response = await api('listEvents', params)
168172
if (response && response.listeventsresponse) {
169173
const events = response.listeventsresponse.event || []

0 commit comments

Comments
 (0)