minor details correction

fscollections/forms.py

@@ -51,16 +51,15 @@ def __init__(self, *args, **kwargs):
         self.user_collections = kwargs.pop('user_collections', False)
         self.user_saving_sound = kwargs.pop('user_saving_sound', False)
         self.sound_id = kwargs.pop('sound_id', False)
+
         if self.user_collections:
             self.user_available_collections = Collection.objects.filter(id__in=self.user_collections).exclude(collectionsound__sound__id=self.sound_id)
-        print(self.user_available_collections)
-        print(self.sound_id)
-        print(self.user_collections)
+
         super().__init__(*args, **kwargs)
         self.fields['collection'].choices = [(self.NO_COLLECTION_CHOICE_VALUE, '--- No collection ---'),#in this case this goes to bookmarks collection (might have to be created)
                                            (self.NEW_COLLECTION_CHOICE_VALUE, 'Create a new collection...')] + \
                                            ([(collection.id, collection.name) for collection in self.user_available_collections ]
-                                            if self.user_collections else[])
+                                            if self.user_available_collections else[])
 
         self.fields['new_collection_name'].widget.attrs['placeholder'] = "Fill in the name for the new collection"
         self.fields['collection'].widget.attrs = {
@@ -80,18 +79,12 @@ def save(self, *args, **kwargs):
                     collection_to_use = collection
             else:
                 collection_to_use = Collection.objects.get(id=self.cleaned_data['collection'])
-        else: #en aquest cas - SÍ estem fent servir l'última coleccio, NO estem creant una nova coleccio, NO estem agafant una coleccio existent i 
-            # per tant ens trobem en un cas de NO COLLECTION CHOICE VALUE (no s'ha triat cap coleccio)
-            # si no es tria cap coleccio: l'usuari té alguna colecció? NO -> creem BookmarksCollection pels seus sons privats
-            # SI -> per defecte es posa a BookmarksCollection
+        else:
             try:
                 last_user_collection = \
                     Collection.objects.filter(user=self.user_saving_sound).order_by('-created')[0]
-                # If user has a previous bookmark, use the same category (or use none if no category used in last
-                # bookmark)
                 collection_to_use = last_user_collection
             except IndexError:
-                # This is first bookmark of the user
                 pass 
         # If collection already exists, don't save it and return the existing one
         collection, _ = Collection.objects.get_or_create(

fscollections/views.py

@@ -38,9 +38,9 @@ def collections_for_user(request, collection_id=None):
     user = request.user
     user_collections = Collection.objects.filter(user=user).order_by('-created') 
     is_owner = False
-    #if no collection id is provided for this URL, render the oldest collection
-    #be careful when loading this url without having any collection for a user
-    #only show the collections for which you're the user(owner)
+    # if no collection id is provided for this URL, render the oldest collection
+    # be careful when loading this url without having any collection for a user
+    # only show the collections for which you're the user(owner)
 
     if not collection_id:
         collection = user_collections.last()    
@@ -65,8 +65,8 @@ def collections_for_user(request, collection_id=None):
 #NOTE: tbd - when a user wants to save a sound without having any collection, create a personal bookmarks collection
 
 def add_sound_to_collection(request, sound_id):
-    #this view from now on should create a new CollectionSound object instead of adding
-    #a sound to collection.sounds
+    # this view from now on should create a new CollectionSound object instead of adding
+    # a sound to collection.sounds
     # TODO: add restrictions for sound repetition and for user being owner/maintainer
     sound = get_object_or_404(Sound, id=sound_id)
     msg_to_return = ''
@@ -95,8 +95,7 @@ def add_sound_to_collection(request, sound_id):
 def delete_sound_from_collection(request, collectionsound_id):
     #this should work as in Packs - select several sounds and remove them all at once from the collection
     #by now it works as in Bookmarks in terms of UI
-    #TODO: this should be done through a POST request method, would be easier to send CollectionSound ID and delete it directly
-    # this would save up a query
+    #TODO: this should be done through a POST request method
     collection_sound = get_object_or_404(CollectionSound, id=collectionsound_id)
     collection = collection_sound.collection
     collection_sound.delete()
@@ -122,8 +121,6 @@ def get_form_for_collecting_sound(request, sound_id):
                                user_collections=user_collections)
 
     collections_already_containing_sound = Collection.objects.filter(user=request.user, collectionsound__sound__id=sound.id).distinct()
-    # collect_sound_url = '/'.join(
-       # request.build_absolute_uri(reverse('add-sound-to-collection', args=[sound_id])).split('/')[:-2]) + '/'
     tvars = {'user': request.user,
              'sound': sound,
              'sound_is_moderated_and_processed_ok': sound.moderated_and_processed_ok,