inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 13:05:42 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into triggers

Browse Source
This commit is contained in:
Oliver
2022-01-09 08:15:47 +11:00
parent ff7a75266b 63ed59ebcf
commit af1bfb2f87
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/templates/js/translated/build.js
View File

@ -133,8 +133,11 @@ function completeBuildOrder(build_id, options={}) {
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 {
html += `
<div class='alert alert-block alert-danger'>

7
InvenTree/templates/js/translated/modals.js
View File

@ -555,13 +555,18 @@ function renderErrorMessage(xhr) {
}
function showAlertDialog(title, content) {
function showAlertDialog(title, content, options={}) {
/* Display a modal dialog message box.
*
* title - Title text
* 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({
title: title,