summaryrefslogtreecommitdiffstats
path: root/core/views/uploads.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-08-11 23:35:53 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-08-11 23:35:53 +0300
commit1bbfd1e517ec4f39f8f5413460e7d4235042e993 (patch)
treeda36c8d28ca963b3fd75ed4cb0b4640e52507010 /core/views/uploads.py
parente35616a6114de58536c7c01aa328905044c83f7b (diff)
downloadtroggle-1bbfd1e517ec4f39f8f5413460e7d4235042e993.tar.gz
troggle-1bbfd1e517ec4f39f8f5413460e7d4235042e993.tar.bz2
troggle-1bbfd1e517ec4f39f8f5413460e7d4235042e993.zip
bugfix in photo upload, untidy
Diffstat (limited to 'core/views/uploads.py')
-rw-r--r--core/views/uploads.py33
1 files changed, 21 insertions, 12 deletions
diff --git a/core/views/uploads.py b/core/views/uploads.py
index 619ea90..09f612c 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -62,7 +62,7 @@ class FilesForm(forms.Form): # not a model-form, just a form-form
class FilesRenameForm(forms.Form): # not a model-form, just a form-form
uploadfiles = forms.FileField()
- renameto = forms.CharField(strip=True)
+ renameto = forms.CharField(strip=True, required=False)
class TextForm(forms.Form): # not a model-form, just a form-form
photographer = forms.CharField(strip=True)
@@ -503,18 +503,27 @@ def photoupload(request, folder=None):
renameto = request.POST["renameto"]
actual_saved = []
- if multiple:
+ if multiple:
if len(multiple) == 1:
- try: # crashes in Django os.chmod call if on WSL, but does save file!
- saved_filename = fs.save(renameto, content=f)
- except:
- print(f'\n !! Permissions failure ?! on attempting to save file {f.name}')
- if 'saved_filename' in locals():
- if saved_filename.is_file():
- actual_saved.append(saved_filename)
- filesaved = True
-
- else:
+ if renameto != "":
+ try: # crashes in Django os.chmod call if on WSL, but does save file!
+ saved_filename = fs.save(renameto, content=f)
+ except:
+ print(f'\n !! Permissions failure ?! on attempting to save file {f.name}')
+ if 'saved_filename' in locals():
+ if saved_filename.is_file():
+ actual_saved.append(saved_filename)
+ filesaved = True
+ else: # multiple is the uploaded content
+ try: # crashes in Django os.chmod call if on WSL, but does save file!
+ saved_filename = fs.save(f.name, content=f)
+ except:
+ print(f'\n !! Permissions failure ?! on attempting to save file {f.name}')
+ if 'saved_filename' in locals():
+ if saved_filename.is_file():
+ actual_saved.append(saved_filename)
+ filesaved = True
+ else: # multiole is a list of content
for f in multiple:
try: # crashes in Django os.chmod call if on WSL, but does save file!
saved_filename = fs.save(f.name, content=f)