Display template name
This commit is contained in:
parent
c2b05debd2
commit
59cd593a3b
|
@ -327,6 +327,7 @@ struct LIBREPOMGR_EXPORT BuildActionBasicInfo : public ReflectiveRapidJSON::Json
|
||||||
explicit BuildActionBasicInfo(const BuildAction &buildAction)
|
explicit BuildActionBasicInfo(const BuildAction &buildAction)
|
||||||
: id(buildAction.id)
|
: id(buildAction.id)
|
||||||
, taskName(buildAction.taskName)
|
, taskName(buildAction.taskName)
|
||||||
|
, templateName(buildAction.templateName)
|
||||||
, directory(buildAction.directory)
|
, directory(buildAction.directory)
|
||||||
, packageNames(buildAction.packageNames)
|
, packageNames(buildAction.packageNames)
|
||||||
, sourceDbs(buildAction.sourceDbs)
|
, sourceDbs(buildAction.sourceDbs)
|
||||||
|
@ -345,6 +346,7 @@ struct LIBREPOMGR_EXPORT BuildActionBasicInfo : public ReflectiveRapidJSON::Json
|
||||||
|
|
||||||
const BuildAction::IdType id;
|
const BuildAction::IdType id;
|
||||||
const std::string &taskName;
|
const std::string &taskName;
|
||||||
|
const std::string &templateName;
|
||||||
const std::string &directory;
|
const std::string &directory;
|
||||||
const std::vector<std::string> &packageNames;
|
const std::vector<std::string> &packageNames;
|
||||||
const std::vector<std::string> &sourceDbs, &destinationDbs;
|
const std::vector<std::string> &sourceDbs, &destinationDbs;
|
||||||
|
|
|
@ -357,7 +357,13 @@ function showBuildActions(ajaxRequest)
|
||||||
result: function(value) {
|
result: function(value) {
|
||||||
return GenericRendering.renderNoneInGrey(Utils.getProperty(globalInfo.buildActionResults[value], 'name', 'Invalid/unknown'));
|
return GenericRendering.renderNoneInGrey(Utils.getProperty(globalInfo.buildActionResults[value], 'name', 'Invalid/unknown'));
|
||||||
},
|
},
|
||||||
type: function(value) {
|
type: function(value, row) {
|
||||||
|
let templateName = row.templateName;
|
||||||
|
if (templateName) {
|
||||||
|
templateName = templateName[0].toUpperCase() + templateName.substring(1);
|
||||||
|
templateName = templateName.replace(/-/g, ' ');
|
||||||
|
return document.createTextNode(templateName);
|
||||||
|
}
|
||||||
return document.createTextNode(Utils.getProperty(globalInfo.buildActionTypes[value], 'name', 'Invalid/debugging'));
|
return document.createTextNode(Utils.getProperty(globalInfo.buildActionTypes[value], 'name', 'Invalid/debugging'));
|
||||||
},
|
},
|
||||||
created: GenericRendering.renderShortTimeStamp,
|
created: GenericRendering.renderShortTimeStamp,
|
||||||
|
@ -482,8 +488,8 @@ function renderBuildActionDetailsTable(buildActionDetails)
|
||||||
{
|
{
|
||||||
return GenericRendering.renderTableFromJsonObject({
|
return GenericRendering.renderTableFromJsonObject({
|
||||||
data: buildActionDetails,
|
data: buildActionDetails,
|
||||||
displayLabels: ['ID', 'Task', 'Type', 'Status', 'Result', 'Result data', 'Created', 'Started', 'Finished', 'Start after', 'Directory', 'Source repo', 'Destination repo', 'Packages', 'Flags', 'Settings', 'Log files', 'Artefacts'],
|
displayLabels: ['ID', 'Task', 'Type', 'Template', 'Status', 'Result', 'Result data', 'Created', 'Started', 'Finished', 'Start after', 'Directory', 'Source repo', 'Destination repo', 'Packages', 'Flags', 'Settings', 'Log files', 'Artefacts'],
|
||||||
fieldAccessors: ['id', 'taskName', 'type', 'status', 'result', 'resultData', 'created', 'started', 'finished', 'startAfter', 'directory', 'sourceDbs', 'destinationDbs', 'packageNames', 'flags', 'settings', 'logfiles', 'artefacts'],
|
fieldAccessors: ['id', 'taskName', 'type', 'templateName', 'status', 'result', 'resultData', 'created', 'started', 'finished', 'startAfter', 'directory', 'sourceDbs', 'destinationDbs', 'packageNames', 'flags', 'settings', 'logfiles', 'artefacts'],
|
||||||
customRenderer: {
|
customRenderer: {
|
||||||
taskName: function (value) {
|
taskName: function (value) {
|
||||||
if (!value) {
|
if (!value) {
|
||||||
|
@ -491,6 +497,16 @@ function renderBuildActionDetailsTable(buildActionDetails)
|
||||||
}
|
}
|
||||||
return document.createTextNode(Utils.getProperty(globalInfo.presets.tasks[value], 'name', value));
|
return document.createTextNode(Utils.getProperty(globalInfo.presets.tasks[value], 'name', value));
|
||||||
},
|
},
|
||||||
|
templateName: function (value) {
|
||||||
|
const rawTemplateName = value;
|
||||||
|
if (value) {
|
||||||
|
value = value[0].toUpperCase() + value.substring(1);
|
||||||
|
value = value.replace(/-/g, ' ');
|
||||||
|
}
|
||||||
|
var element = GenericRendering.renderNoneInGrey(value);
|
||||||
|
element.title = rawTemplateName;
|
||||||
|
return element;
|
||||||
|
},
|
||||||
status: function(value) {
|
status: function(value) {
|
||||||
return document.createTextNode(Utils.getProperty(globalInfo.buildActionStates[value], 'name', 'Invalid/unknown'));
|
return document.createTextNode(Utils.getProperty(globalInfo.buildActionStates[value], 'name', 'Invalid/unknown'));
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue