inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 04:26:44 +00:00
Code

Moved 'complete build' button to the build detail page

Browse Source
This commit is contained in:
Oliver Walters 2019-05-10 08:44:07 +10:00
parent 932c07287b
commit 66b729d579
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
InvenTree/build/templates/build/allocate.html
View File

@ -20,7 +20,6 @@ InvenTree | Allocate Parts
<div class='btn-group' style='float: right;'> <div class='btn-group' style='float: right;'>
<button class='btn btn-primary' type='button' title='Automatic allocation' id='auto-allocate-build'>Auto Allocate</button> <button class='btn btn-primary' type='button' title='Automatic allocation' id='auto-allocate-build'>Auto Allocate</button>
<button class='btn btn-warning' type='button' title='Unallocate build stock' id='unallocate-build'>Unallocate</button> <button class='btn btn-warning' type='button' title='Unallocate build stock' id='unallocate-build'>Unallocate</button>
<button class='btn btn-success' type='button' title='Complete build' id='complete-build'>Complete Build</button>
</div> </div>
</div> </div>
</div> </div>
@ -56,16 +55,6 @@ InvenTree | Allocate Parts
{% endfor %} {% endfor %}
$("#complete-build").on('click', function() {
launchModalForm(
"{% url 'build-complete' build.id %}",
{
reload: true,
submit_text: "Complete Build",
}
);
});
$("#auto-allocate-build").on('click', function() { $("#auto-allocate-build").on('click', function() {
launchModalForm( launchModalForm(
"{% url 'build-auto-allocate' build.id %}", "{% url 'build-auto-allocate' build.id %}",

16
InvenTree/build/templates/build/detail.html
View File

@ -17,12 +17,15 @@ InvenTree | Build - {{ build }}
<h3> <h3>
<div style='float: right;'> <div style='float: right;'>
<div class="dropdown" style="float: right;"> <div class="dropdown" style="float: right;">
<a href="{% url 'build-allocate' build.id %}">
<button class='btn btn-info' type='button' title='Allocate Parts' id='build-allocate'>Allocate Parts</button>
</a>
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
<span class="caret"></span></button> <span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href='#' id='build-edit' title='Edit build'>Edit build</a></li> <li><a href='#' id='build-edit' title='Edit build'>Edit build</a></li>
{% if build.is_active %} {% if build.is_active %}
<li><a href="{% url 'build-allocate' build.id %}" title='Allocate parts'>Allocate Parts</a></li> <li><a href='#' id='build-complete' title='Complete Build'>Complete Build</a></li>
<li><a href='#' id='build-cancel' title='Cancel build'>Cancel build</a></li> <li><a href='#' id='build-cancel' title='Cancel build'>Cancel build</a></li>
{% endif %} {% endif %}
</ul> </ul>
@ -127,4 +130,15 @@ InvenTree | Build - {{ build }}
submit_text: "Cancel Build", submit_text: "Cancel Build",
}); });
}); });
$("#build-complete").on('click', function() {
launchModalForm(
"{% url 'build-complete' build.id %}",
{
reload: true,
submit_text: "Complete Build",
}
);
});
{% endblock %} {% endblock %}