[REVIEW] 466 - Fix created object owner definition

src/ARte/users/forms.py

@@ -192,20 +192,26 @@ class Meta:
         exclude = ('owner', 'uploaded_at', 'patt')
 
     def save(self, *args, **kwargs):
+        commit = kwargs.get('commit', True)
+
         with Image.open(self.instance.source) as image:
             pil_image = generate_marker_from_image(image)
             blob = BytesIO()
             pil_image.save(blob, 'JPEG')
             filename = self.instance.source.name
-            self.instance.source.save(filename, File(blob),save=False)
+            self.instance.source.save(filename, File(blob), save=commit)
             patt_str = generate_patt_from_image(image)
-            self.instance.patt.save(filename + ".patt", ContentFile(patt_str.encode('utf-8')),save=False)
-
+
+            self.instance.patt.save(
+                f"{filename}.patt",
+                ContentFile(patt_str.encode('utf-8')),
+                save=commit,
+            )
+
             if kwargs.get("owner"):
                 self.instance.owner = kwargs.get("owner")
                 del kwargs["owner"]
-            self.instance.save()
-
+
             return super(UploadMarkerForm,self).save(*args, **kwargs)
 
 class UploadObjectForm(forms.ModelForm):
@@ -226,6 +232,13 @@ class Meta:
         model = Object
         fields = ('source', 'author', 'title', 'scale', 'position', 'rotation')
 
+    def save(self, *args, **kwargs):
+        if owner := kwargs.get("owner", None):
+            self.instance.owner = owner
+            del kwargs["owner"]
+
+        return super(UploadObjectForm, self).save(*args, **kwargs)
+
 
 class ArtworkForm(forms.Form):
 
@@ -253,7 +266,7 @@ class ExhibitForm(forms.Form):
     name = forms.CharField(max_length=50, required=True)
     slug = forms.CharField(max_length=50, required=True)
 
-    # FIXME: maybe this can be improved. Possible bug on max artworks per exhibit 
+    # FIXME: maybe this can be improved. Possible bug on max artworks per exhibit
     artworks = forms.CharField(max_length=1000)
 
     def clean_slug(self):

src/ARte/users/views.py

@@ -101,7 +101,7 @@ def recover_code(request):
 
             return redirect('wrong-verification-code')
         return redirect('home')
-    
+
     form = RecoverPasswordCodeForm()
     return render(request, 'users/recover-password-code.jinja2', {'form': form})
 
@@ -130,9 +130,9 @@ def invalid_recovering_email_or_username(request):
 @login_required
 @require_http_methods(["GET"])
 def profile(request):
-   
+
     user = request.GET.get('user')
-    
+
     if user:
         profile = Profile.objects.get(user=user)
     else:
@@ -149,7 +149,7 @@ def profile(request):
         'artworks': artworks,
         'markers':markers,
         'objects':objects,
-        'profile':True, 
+        'profile':True,
         'button_enable': False if user else True
     }
     return render(request, 'users/profile.jinja2', ctx)
@@ -345,8 +345,8 @@ def upload_elements(request, form_class, form_type, route):
     if request.method == 'POST':
         form = form_class(request.POST, request.FILES)
         if form.is_valid():
-            upload = form.save(owner=request.user.profile)
-            # upload.owner = request.user.profile
+            upload = form.save(commit=False)
+            upload.owner = request.user.profile
             upload.save()
             return redirect('home')
     else:
@@ -378,7 +378,7 @@ def edit_elements(request, form_class, route, model, model_data):
         if form.is_valid():
             form.save()
             return redirect('profile')
-        
+
         log.warning(form.errors)
 
     return render(
@@ -565,7 +565,7 @@ def edit_profile(request):
 @require_http_methods(["GET"])
 def delete(request):
     content_type = request.GET.get('content_type', None)
-   
+
     if content_type == 'marker':
         delete_content(Marker, request.user, request.GET.get('id', -1))
     elif content_type == 'object':
@@ -578,9 +578,9 @@ def delete(request):
 
 def delete_content(model, user, instance_id):
     qs = model.objects.filter(id=instance_id)
-   
+
     if qs:
-        instance = qs[0] 
+        instance = qs[0]
         if user.has_perm('users.moderator'):
             delete_content_Moderator(instance,user)
         else:
@@ -589,11 +589,11 @@ def delete_content(model, user, instance_id):
                 hasPermission = (instance.author == user.profile)
             else:
                 hasPermission = (instance.owner == user.profile)
-        
+
             isInstanceSameTypeofModel = isinstance(instance, model)
             if isInstanceSameTypeofModel and hasPermission:
                 instance.delete()
-        
+
 
 def delete_content_Moderator(instance,user):
     isInstanceSameTypeofModel = isinstance(instance, model)