Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Display template name

This commit is contained in:
Martchus 2022-03-12 22:46:42 +01:00
parent c2b05debd2
commit 59cd593a3b
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librepomgr/buildactions/buildaction.h
View File

@ -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<std::string> &packageNames;
const std::vector<std::string> &sourceDbs, &destinationDbs;

22
srv/static/js/buildactionspage.js
View File

@ -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'));
},