diff --git a/package/share/ahriman/templates/build-status.jinja2 b/package/share/ahriman/templates/build-status.jinja2 index 1841b01b..edd1076a 100644 --- a/package/share/ahriman/templates/build-status.jinja2 +++ b/package/share/ahriman/templates/build-status.jinja2 @@ -18,15 +18,15 @@
@@ -70,6 +64,8 @@ packageInfoLogsInput.empty(); packageInfoModal.trigger("reset"); + + hideInfoControls(true); }); const packageInfoLogsInput = $("#package-info-logs-input"); @@ -89,6 +85,11 @@ await copyToClipboard(logs, packageInfoLogsCopyButton); } + function hideInfoControls(hidden) { + packageInfoRemoveButton.attr("hidden", hidden); + packageInfoUpdateButton.attr("hidden", hidden); + } + function insertVariable(packageBase, variable) { const variableInput = document.createElement("div"); variableInput.classList.add("input-group"); @@ -189,8 +190,13 @@ packageInfoPackager.text(description.package.packager); packageInfoPackages.html(listToTable(packages)); packageInfoVersion.text(description.package.version); + + hideInfoControls(false); + }, + error: (jqXHR, _, errorThrown) => { + hideInfoControls(true); + onFailure(jqXHR, null, errorThrown); }, - error: onFailure, }); } @@ -214,7 +220,7 @@ function packageInfoUpdate() { const packageBase = packageInfoModal.data("package"); - if (packageBase) return packagesAdd(packageBase, []); + if (packageBase) return packagesAdd(packageBase, [], repository); } function showPackageInfo(packageBase) { diff --git a/package/share/ahriman/templates/build-status/table.jinja2 b/package/share/ahriman/templates/build-status/table.jinja2 index 35f83aaf..959c57f7 100644 --- a/package/share/ahriman/templates/build-status/table.jinja2 +++ b/package/share/ahriman/templates/build-status/table.jinja2 @@ -5,6 +5,9 @@ const packageRemoveButton = $("#package-remove-button"); const packageUpdateButton = $("#package-update-button"); + const packageInfoRemoveButton = $("#package-info-remove-button"); + const packageInfoUpdateButton = $("#package-info-update-button"); + let repository = null; $("#repositories a").on("click", (event) => { const element = event.target; @@ -12,7 +15,7 @@ architecture: element.dataset.architecture, repository: element.dataset.repository, }; - packageUpdateButton.html(` update ${safe(repository.repository)} (${safe(repository.architecture)})`); + packageUpdateButton.html(` update ${safe(repository.repository)} (${safe(repository.architecture)})`); $(`#${element.id}`).tab("show"); reload(); }); @@ -202,7 +205,7 @@ function selectRepository() { const fragment = window.location.hash.replace("#", "") || "{{ repositories[0].id }}"; - const element = $(`#${fragment}-lnk`); + const element = $(`#${fragment}-link`); element.click(); } diff --git a/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2 b/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2 index c8c48259..0a01e089 100644 --- a/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2 +++ b/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2 @@ -1,4 +1,4 @@ - + @@ -8,14 +8,12 @@ - + - - - - - + + +