mirror of
https://github.com/inventree/InvenTree.git
synced 2025-06-19 05:25:42 +00:00
Fix issues for AjaxUdpateView
- Works properly now! - Can edit BOM item inline - Can add BOM item inline too
This commit is contained in:
@ -63,10 +63,11 @@ class EditBomItemForm(forms.ModelForm):
|
||||
super(EditBomItemForm, self).__init__(*args, **kwargs)
|
||||
self.helper = FormHelper()
|
||||
|
||||
self.helper.form_id = 'id-edit-part-form'
|
||||
#self.helper.form_id = 'id-edit-part-form'
|
||||
self.helper.form_method = 'post'
|
||||
|
||||
self.helper.add_input(Submit('submit', 'Submit'))
|
||||
self.helper.form_tag = False
|
||||
#self.helper.add_input(Submit('submit', 'Submit'))
|
||||
|
||||
class Meta:
|
||||
model = BomItem
|
||||
|
@ -1,9 +1,16 @@
|
||||
{% extends "part/part_base.html" %}
|
||||
|
||||
{% load static %}
|
||||
{% block details %}
|
||||
|
||||
{% include 'part/tabs.html' with tab='bom' %}
|
||||
|
||||
<div class='modal fade' id='modal-form'>
|
||||
<div class='modal-dialog'>
|
||||
<div class='modal-content'>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3>Bill of Materials</h3>
|
||||
|
||||
<table class="table table-striped">
|
||||
@ -18,9 +25,9 @@
|
||||
<tr>
|
||||
<td><a href="{% url 'part-detail' sub_part.id %}">{{ sub_part.name }}</a></td>
|
||||
<td>{{ sub_part.description }}</td>
|
||||
<td>{{ bom_item.quantity }}</span></td>
|
||||
<td>{{ bom_item.quantity }}</td>
|
||||
<td>
|
||||
<button type='button' class='btn btn-success'>Edit</button>
|
||||
<button type='button' url="{% url 'bom-item-edit' bom_item.id %}" class='btn btn-success edit-row-button'>Edit</button>
|
||||
</td>
|
||||
</tr>
|
||||
{% endwith %}
|
||||
@ -28,9 +35,7 @@
|
||||
</table>
|
||||
|
||||
<div class='container-fluid'>
|
||||
<a href="{% url 'bom-item-create' %}?parent={{ part.id }}">
|
||||
<button class='btn btn-success'>Add BOM Item</button>
|
||||
</a>
|
||||
<button type='button' class='btn btn-success' id='new-bom-item'>Add BOM Item</button>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@ -39,4 +44,19 @@
|
||||
|
||||
<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
|
||||
|
||||
<script type='text/javascript'>
|
||||
$(".edit-row-button").click(function () {
|
||||
var button = $(this);
|
||||
|
||||
launchModalForm("#modal-form",
|
||||
button.attr('url'));
|
||||
|
||||
});
|
||||
|
||||
$("#new-bom-item").click(function () {
|
||||
launchModalForm("#modal-form",
|
||||
"{% url 'bom-item-create' %}/?parent={{ part.id }}");
|
||||
});
|
||||
</script>
|
||||
|
||||
{% endblock %}
|
@ -54,10 +54,12 @@
|
||||
|
||||
<script type='text/javascript'>
|
||||
|
||||
bindModalForm('#modal-cat',
|
||||
'.js-create-cat',
|
||||
"{% url 'category-create' %}",
|
||||
{category: {{ category.id }} });
|
||||
$(".js-create-cat").click(function() {
|
||||
launchModalForm("#modal-cat",
|
||||
"{% url 'category-create' %}",
|
||||
{category: {{ category.id }} });
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
@ -40,8 +40,6 @@ $(document).ready(function () {
|
||||
$(".js-create-cat").click(function() {
|
||||
launchModalForm("#modal-cat", "{% url 'category-create' %}");
|
||||
});
|
||||
|
||||
//bindModalForm('#modal-cat', '.js-create-cat', "{% url 'category-create' %}");
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@ -19,7 +19,7 @@ from .forms import EditBomItemForm
|
||||
|
||||
from .forms import EditSupplierPartForm
|
||||
|
||||
from InvenTree.views import AjaxCreateView
|
||||
from InvenTree.views import AjaxCreateView, AjaxUpdateView
|
||||
|
||||
class PartIndex(ListView):
|
||||
model = Part
|
||||
@ -168,10 +168,12 @@ class BomItemDetail(DetailView):
|
||||
template_name = 'part/bom-detail.html'
|
||||
|
||||
|
||||
class BomItemCreate(CreateView):
|
||||
class BomItemCreate(AjaxCreateView):
|
||||
model = BomItem
|
||||
form_class = EditBomItemForm
|
||||
template_name = 'part/bom-create.html'
|
||||
ajax_template_name = 'modal_form.html'
|
||||
ajax_form_title = 'Create BOM item'
|
||||
|
||||
def get_initial(self):
|
||||
# Look for initial values
|
||||
@ -186,10 +188,12 @@ class BomItemCreate(CreateView):
|
||||
return initials
|
||||
|
||||
|
||||
class BomItemEdit(UpdateView):
|
||||
class BomItemEdit(AjaxUpdateView):
|
||||
model = BomItem
|
||||
form_class = EditBomItemForm
|
||||
template_name = 'part/bom-edit.html'
|
||||
ajax_template_name = 'modal_form.html'
|
||||
ajax_form_title = 'Edit BOM item'
|
||||
|
||||
|
||||
class BomItemDelete(DeleteView):
|
||||
|
Reference in New Issue
Block a user