2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 13:35:40 +00:00

Test that uploaded image is an image file, return error otherwise

- New javascript function inventreeFileUpload
This commit is contained in:
Oliver Walters
2019-05-06 22:20:06 +10:00
parent c88149b9aa
commit bb702367b6
8 changed files with 86 additions and 53 deletions

View File

@ -78,7 +78,6 @@ class EditPartForm(HelperForm):
'purchaseable',
'salable',
'notes',
'image',
]

View File

@ -153,7 +153,7 @@
{
accept_text: 'Activate',
accept: function() {
inventreeUpdate(
inventreePut(
"{% url 'api-part-detail' part.id %}",
{
active: true,
@ -176,7 +176,7 @@
{
accept_text: 'Deactivate',
accept: function() {
inventreeUpdate(
inventreePut(
"{% url 'api-part-detail' part.id %}",
{
active: false,

View File

@ -108,47 +108,22 @@
var files = transfer.files;
console.log('dropped');
if (files.length > 0) {
var file = files[0];
var formData = new FormData();
var token = getCookie('csrftoken');
formData.append('file', file);
$.ajax({
beforeSend: function(xhr, settings) {
xhr.setRequestHeader('X-CSRFToken', token);
},
url: "{% url 'part-image-upload' part.id %}",
type: 'POST',
data: formData,
processData: false,
contentType: false,
success: function(data, status, xhr) {
//location.reload();
},
error: function(xhr, status, error) {
console.log('Error uploading thumbnail: ' + status);
console.log(error);
}
});
/*
inventreeUpdate(
inventreeFileUpload(
"{% url 'part-image-upload' part.id %}",
formData,
file,
{},
{
method: 'POST',
dataType: 'json',
success: function(data, status, xhr) {
location.reload();
},
error: function(xhr, status, error) {
showAlertDialog('Error uploading image', renderErrorMessage(xhr));
}
}
);
*/
console.log('submitted');
}
});

View File

@ -30,7 +30,7 @@ from .forms import EditSupplierPartForm
from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView
from InvenTree.views import QRCodeView
from InvenTree.helpers import DownloadFile, str2bool
from InvenTree.helpers import DownloadFile, str2bool, TestIfImage
class PartIndex(ListView):
@ -275,22 +275,29 @@ class UploadPartImage(AjaxView):
model = Part
def post(self, request, *args, **kwargs):
response = {}
status = 200
try:
part = Part.objects.get(pk=kwargs.get('pk'))
except Part.DoesNotExist:
error_dict = {
'error': 'Part not found',
}
response['error'] = 'Part not found'
return JsonResponse(error_dict, status=404)
print("Files:", request.FILES)
uploaded_file = request.FILES['file']
response_dict = {
'success': 'File was uploaded successfully',
}
if TestIfImage(uploaded_file):
part.image = uploaded_file
part.clean()
part.save()
return JsonResponse(response_dict, status=200)
response['success'] = 'File was uploaded successfully'
else:
response['error'] = 'Not a valid image file'
status = 400
return JsonResponse(response, status=status)