mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Drag and drop for order attachments
This commit is contained in:
parent
7143c32fc9
commit
30b5f7d507
23
InvenTree/order/migrations/0035_auto_20200513_0016.py
Normal file
23
InvenTree/order/migrations/0035_auto_20200513_0016.py
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
# Generated by Django 3.0.5 on 2020-05-13 00:16
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('order', '0034_auto_20200512_1054'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='purchaseorderattachment',
|
||||||
|
name='comment',
|
||||||
|
field=models.CharField(blank=True, help_text='File comment', max_length=100),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='salesorderattachment',
|
||||||
|
name='comment',
|
||||||
|
field=models.CharField(blank=True, help_text='File comment', max_length=100),
|
||||||
|
),
|
||||||
|
]
|
@ -20,6 +20,20 @@
|
|||||||
{% block js_ready %}
|
{% block js_ready %}
|
||||||
{{ block.super }}
|
{{ block.super }}
|
||||||
|
|
||||||
|
enableDragAndDrop(
|
||||||
|
'#attachment-dropzone',
|
||||||
|
"{% url 'po-attachment-create' %}",
|
||||||
|
{
|
||||||
|
data: {
|
||||||
|
order: {{ order.id }},
|
||||||
|
},
|
||||||
|
label: 'attachment',
|
||||||
|
success: function(data, status, xhr) {
|
||||||
|
location.reload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
$("#new-attachment").click(function() {
|
$("#new-attachment").click(function() {
|
||||||
launchModalForm("{% url 'po-attachment-create' %}?order={{ order.id }}",
|
launchModalForm("{% url 'po-attachment-create' %}?order={{ order.id }}",
|
||||||
{
|
{
|
||||||
|
@ -19,6 +19,20 @@
|
|||||||
{% block js_ready %}
|
{% block js_ready %}
|
||||||
{{ block.super }}
|
{{ block.super }}
|
||||||
|
|
||||||
|
enableDragAndDrop(
|
||||||
|
'#attachment-dropzone',
|
||||||
|
"{% url 'so-attachment-create' %}",
|
||||||
|
{
|
||||||
|
data: {
|
||||||
|
order: {{ order.id }},
|
||||||
|
},
|
||||||
|
label: 'attachment',
|
||||||
|
success: function(data, status, xhr) {
|
||||||
|
location.reload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
$("#new-attachment").click(function() {
|
$("#new-attachment").click(function() {
|
||||||
launchModalForm("{% url 'so-attachment-create' %}?order={{ order.id }}",
|
launchModalForm("{% url 'so-attachment-create' %}?order={{ order.id }}",
|
||||||
{
|
{
|
||||||
|
@ -112,7 +112,10 @@ class PurchaseOrderAttachmentCreate(AjaxCreateView):
|
|||||||
|
|
||||||
initials = super(AjaxCreateView, self).get_initial()
|
initials = super(AjaxCreateView, self).get_initial()
|
||||||
|
|
||||||
|
try:
|
||||||
initials["order"] = PurchaseOrder.objects.get(id=self.request.GET.get('order', -1))
|
initials["order"] = PurchaseOrder.objects.get(id=self.request.GET.get('order', -1))
|
||||||
|
except (ValueError, PurchaseOrder.DoesNotExist):
|
||||||
|
pass
|
||||||
|
|
||||||
return initials
|
return initials
|
||||||
|
|
||||||
@ -149,7 +152,10 @@ class SalesOrderAttachmentCreate(AjaxCreateView):
|
|||||||
def get_initial(self):
|
def get_initial(self):
|
||||||
initials = super().get_initial().copy()
|
initials = super().get_initial().copy()
|
||||||
|
|
||||||
|
try:
|
||||||
initials['order'] = SalesOrder.objects.get(id=self.request.GET.get('order', None))
|
initials['order'] = SalesOrder.objects.get(id=self.request.GET.get('order', None))
|
||||||
|
except (ValueError, SalesOrder.DoesNotExist):
|
||||||
|
pass
|
||||||
|
|
||||||
return initials
|
return initials
|
||||||
|
|
||||||
|
18
InvenTree/part/migrations/0038_auto_20200513_0016.py
Normal file
18
InvenTree/part/migrations/0038_auto_20200513_0016.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 3.0.5 on 2020-05-13 00:16
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('part', '0037_partattachment_upload_date'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='partattachment',
|
||||||
|
name='comment',
|
||||||
|
field=models.CharField(blank=True, help_text='File comment', max_length=100),
|
||||||
|
),
|
||||||
|
]
|
18
InvenTree/stock/migrations/0039_auto_20200513_0016.py
Normal file
18
InvenTree/stock/migrations/0039_auto_20200513_0016.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 3.0.5 on 2020-05-13 00:16
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('stock', '0038_stockitemattachment_upload_date'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='stockitemattachment',
|
||||||
|
name='comment',
|
||||||
|
field=models.CharField(blank=True, help_text='File comment', max_length=100),
|
||||||
|
),
|
||||||
|
]
|
Loading…
Reference in New Issue
Block a user