Formatage du code modifié
This commit is contained in:
parent
6364ec890e
commit
60040471f0
1 changed files with 11 additions and 11 deletions
|
|
@ -191,16 +191,18 @@ class GalleryUpload(PermissionRequiredMixin, FormView):
|
|||
def form_valid(self, form):
|
||||
# Get or create gallery
|
||||
|
||||
if self.request.accepts('text/html') or not self.request.accepts('application/json'):
|
||||
if self.request.accepts("text/html") or not self.request.accepts(
|
||||
"application/json"
|
||||
):
|
||||
response_json = False
|
||||
finish_json = False
|
||||
else :
|
||||
else:
|
||||
response_json = True
|
||||
finish_json = form.data.get("end","") == "end"
|
||||
finish_json = form.data.get("end", "") == "end"
|
||||
|
||||
gallery = form.get_or_create_gallery()
|
||||
|
||||
jsondata = {"galleryID":gallery.id,"code":200}
|
||||
jsondata = {"galleryID": gallery.id, "code": 200}
|
||||
|
||||
gallery_year = Path(str(gallery.date_start.year))
|
||||
gallery_dir = gallery_year / gallery.slug
|
||||
|
|
@ -219,7 +221,7 @@ class GalleryUpload(PermissionRequiredMixin, FormView):
|
|||
messages.error(
|
||||
self.request, f"{photo_file.name} was not recognized as an image"
|
||||
)
|
||||
jsondata["code"]=400
|
||||
jsondata["code"] = 400
|
||||
jsondata["error"] = f"{photo_file.name} was not recognized as an image"
|
||||
continue
|
||||
|
||||
|
|
@ -242,10 +244,9 @@ class GalleryUpload(PermissionRequiredMixin, FormView):
|
|||
|
||||
uploaded_photo_name.append(photo_file.name)
|
||||
|
||||
|
||||
# Notify user then managers
|
||||
n_success = len(uploaded_photo_name)
|
||||
if not response_json :
|
||||
if not response_json:
|
||||
if already_exists:
|
||||
messages.success(
|
||||
self.request,
|
||||
|
|
@ -253,7 +254,6 @@ class GalleryUpload(PermissionRequiredMixin, FormView):
|
|||
)
|
||||
else:
|
||||
messages.success(self.request, f"{n_success} photo(s) uploaded.")
|
||||
|
||||
|
||||
# Notify administrators on new uploads
|
||||
gallery_url = reverse_lazy("photologue:pl-gallery", args=[gallery.slug])
|
||||
|
|
@ -265,15 +265,15 @@ class GalleryUpload(PermissionRequiredMixin, FormView):
|
|||
message=f"{self.request.user.username} has uploaded in <{gallery_url}>:\n{photos}",
|
||||
)
|
||||
|
||||
elif response_json and finish_json :
|
||||
elif response_json and finish_json:
|
||||
photos = ", ".join(uploaded_photo_name)
|
||||
mail_admins(
|
||||
subject=f"New continious upload from {self.request.user.username}",
|
||||
message=f"{self.request.user.username} has uploaded multiples photo with continious upload in <{gallery_url}>",
|
||||
)
|
||||
if response_json :
|
||||
if response_json:
|
||||
jsondata["uploadeds"] = uploaded_photo_name
|
||||
return JsonResponse(jsondata)
|
||||
|
||||
else :
|
||||
else:
|
||||
return super().form_valid(form)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue