NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(jobs): slice ids to be more human readable (#1735)

Browse Source
This commit is contained in:
Olivier Lambert
2016-11-03 16:48:48 +01:00
committed by Julien Fontanet
parent a3570a1c9f
commit c353e71ce7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/xo-app/backup/overview/index.js
View File

@@ -154,7 +154,7 @@ export default class Overview extends Component {
return (
<tr key={key}>
<td>{job.id} ({this._getJobLabel(job)})</td>
<td>{job.id.slice(0, 5)} ({this._getJobLabel(job)})</td>
<td>{this._getScheduleTag(schedule, job)}</td>
<td className='hidden-xs-down'>{schedule.cron}</td>
<td className='hidden-xs-down'>{schedule.timezone || _('jobServerTimezone')}</td>

4
src/xo-app/jobs/overview/index.js
View File

@@ -85,11 +85,11 @@ export default class Overview extends Component {
}
_getJobLabel (job = {}) {
return `${job.name} - ${job.method} (${job.id})`
return `${job.name} - ${job.method} (${job.id.slice(0, 5)})`
}
_getScheduleLabel (schedule) {
return `${schedule.name} (${schedule.id})`
return `${schedule.name} (${schedule.id.slice(0, 5)})`
}
_getScheduleToggle (schedule) {

4
src/xo-app/jobs/scheduling/index.js
View File

@@ -190,9 +190,9 @@ export default class Schedules extends Component {
{isEmpty(schedules) && <tr><td><em>{_('noSchedules')}</em></td></tr>}
{map(schedules, schedule => <tr key={schedule.id}>
<td>
<span>{schedule.name} <span className='text-muted'>({schedule.id})</span></span>
<span>{schedule.name} <span className='text-muted'>({schedule.id.slice(0, 5)})</span></span>
</td>
<td>{jobs[schedule.job] && <span>{jobs[schedule.job].name} - {jobs[schedule.job].method} <span className='text-muted'>({schedule.job})</span></span>}</td>
<td>{jobs[schedule.job] && <span>{jobs[schedule.job].name} - {jobs[schedule.job].method} <span className='text-muted'>({schedule.job.slice(0, 5)})</span></span>}</td>
<td className='hidden-xs-down'>{schedule.cron}</td>
<td className='hidden-xs-down'>{schedule.timezone || _('jobServerTimezone')}</td>
<td>

2
src/xo-app/logs/index.js
View File

@@ -168,7 +168,7 @@ export default class LogList extends Component {
logsToClear.push(logKey)
logs[logKey] = {
logKey,
jobId: data.jobId,
jobId: data.jobId.slice(0, 5),
key: data.key,
userId: data.userId,
start: time,