2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 11:36:44 +00:00

Merge pull request #2517 from SchrodingersGat/build-complete-fix

Fix messaging in build complete dialog
This commit is contained in:
Oliver 2022-01-09 08:12:52 +11:00 committed by GitHub
commit 63ed59ebcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions

View File

@ -221,7 +221,10 @@ src="{% static 'img/blank_image.png' %}"
{% if build.incomplete_count > 0 %} {% if build.incomplete_count > 0 %}
showAlertDialog( showAlertDialog(
'{% trans "Incomplete Outputs" %}', '{% trans "Incomplete Outputs" %}',
'{% trans "Build Order cannot be completed as incomplete build outputs remain" %}' '{% trans "Build Order cannot be completed as incomplete build outputs remain" %}',
{
alert_style: 'danger',
}
); );
{% else %} {% else %}

View File

@ -133,8 +133,11 @@ function completeBuildOrder(build_id, options={}) {
var html = ''; var html = '';
if (options.can_complete) { if (options.allocated && options.completed) {
html += `
<div class='alert alert-block alert-success'>
{% trans "Build order is ready to be completed" %}
</div>`;
} else { } else {
html += ` html += `
<div class='alert alert-block alert-danger'> <div class='alert alert-block alert-danger'>

View File

@ -555,13 +555,18 @@ function renderErrorMessage(xhr) {
} }
function showAlertDialog(title, content) { function showAlertDialog(title, content, options={}) {
/* Display a modal dialog message box. /* Display a modal dialog message box.
* *
* title - Title text * title - Title text
* content - HTML content of the dialog window * content - HTML content of the dialog window
*/ */
if (options.alert_style) {
// Wrap content in an alert block
content = `<div class='alert alert-block alert-${options.alert_style}'>${content}</div>`;
}
var modal = createNewModal({ var modal = createNewModal({
title: title, title: title,