diff --git a/librepomgr/buildactions/buildaction.h b/librepomgr/buildactions/buildaction.h index 89f6cdd..0e0d7a5 100644 --- a/librepomgr/buildactions/buildaction.h +++ b/librepomgr/buildactions/buildaction.h @@ -327,6 +327,7 @@ struct LIBREPOMGR_EXPORT BuildActionBasicInfo : public ReflectiveRapidJSON::Json explicit BuildActionBasicInfo(const BuildAction &buildAction) : id(buildAction.id) , taskName(buildAction.taskName) + , templateName(buildAction.templateName) , directory(buildAction.directory) , packageNames(buildAction.packageNames) , sourceDbs(buildAction.sourceDbs) @@ -345,6 +346,7 @@ struct LIBREPOMGR_EXPORT BuildActionBasicInfo : public ReflectiveRapidJSON::Json const BuildAction::IdType id; const std::string &taskName; + const std::string &templateName; const std::string &directory; const std::vector &packageNames; const std::vector &sourceDbs, &destinationDbs; diff --git a/srv/static/js/buildactionspage.js b/srv/static/js/buildactionspage.js index 56ef378..3350fc6 100644 --- a/srv/static/js/buildactionspage.js +++ b/srv/static/js/buildactionspage.js @@ -357,7 +357,13 @@ function showBuildActions(ajaxRequest) result: function(value) { 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')); }, created: GenericRendering.renderShortTimeStamp, @@ -482,8 +488,8 @@ function renderBuildActionDetailsTable(buildActionDetails) { return GenericRendering.renderTableFromJsonObject({ 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'], - fieldAccessors: ['id', 'taskName', 'type', 'status', 'result', 'resultData', 'created', 'started', 'finished', 'startAfter', 'directory', 'sourceDbs', 'destinationDbs', 'packageNames', 'flags', 'settings', 'logfiles', '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', 'templateName', 'status', 'result', 'resultData', 'created', 'started', 'finished', 'startAfter', 'directory', 'sourceDbs', 'destinationDbs', 'packageNames', 'flags', 'settings', 'logfiles', 'artefacts'], customRenderer: { taskName: function (value) { if (!value) { @@ -491,6 +497,16 @@ function renderBuildActionDetailsTable(buildActionDetails) } 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) { return document.createTextNode(Utils.getProperty(globalInfo.buildActionStates[value], 'name', 'Invalid/unknown')); },