wip: edit bookmark categories on the modal

alastair · alastair · commit cf1683ae6f55 · 2025-03-14T19:37:51.000+01:00
diff --git a/bookmarks/forms.py b/bookmarks/forms.py
@@ -60,11 +60,21 @@ def __init__(self, *args, **kwargs):
         self.user_bookmark_categories = kwargs.pop('user_bookmark_categories', False)
         self.user_saving_bookmark = kwargs.pop('user_saving_bookmark', False)
         self.sound_id = kwargs.pop('sound_id', False)
+        # Get categories that already contain this sound
+        self.categories_already_containing_sound = kwargs.pop('categories_already_containing_sound', [])
         super().__init__(*args, **kwargs)
-        self.fields['category'].choices = [(self.NO_CATEGORY_CHOICE_VALUE, '--- No category ---'),
-                                           (self.NEW_CATEGORY_CHOICE_VALUE, 'Create a new category...')] + \
-                                          ([(category.id, category.name) for category in self.user_bookmark_categories]
-                                           if self.user_bookmark_categories else [])
+        
+        # Filter out categories that already contain the sound
+        available_categories = []
+        if self.user_bookmark_categories:
+            for category in self.user_bookmark_categories:
+                if category not in self.categories_already_containing_sound:
+                    available_categories.append((category.id, category.name))
+        
+        self.fields['category'].choices = [
+            (self.NO_CATEGORY_CHOICE_VALUE, '--- No category ---'),
+            (self.NEW_CATEGORY_CHOICE_VALUE, 'Create a new category...')
+        ] + available_categories
         
         self.fields['new_category_name'].widget.attrs['placeholder'] = "Fill in the name for the new category"
         self.fields['category'].widget.attrs = {
diff --git a/bookmarks/views.py b/bookmarks/views.py
@@ -190,21 +190,25 @@ def get_form_for_sound(request, sound_id):
     except IndexError:
         last_category = None
     user_bookmark_categories = BookmarkCategory.objects.filter(user=request.user)
-    form = BookmarkForm(initial={'category': last_category.id if last_category else BookmarkForm.NO_CATEGORY_CHOICE_VALUE},
-                     prefix=sound.id,
-                     user_bookmark_categories=user_bookmark_categories)
     categories_already_containing_sound = BookmarkCategory.objects.filter(user=request.user,
-                                                                          bookmarks__sound=sound).distinct()
-    sound_has_bookmark_without_category = Bookmark.objects.filter(user=request.user, sound=sound, category=None).exists()
+                                                                      bookmarks__sound=sound).distinct()
+    form = BookmarkForm(
+        initial={'category': last_category.id if last_category else BookmarkForm.NO_CATEGORY_CHOICE_VALUE},
+        prefix=sound.id,
+        user_bookmark_categories=user_bookmark_categories,
+        categories_already_containing_sound=categories_already_containing_sound)
+    bookmark_without_category = Bookmark.objects.filter(user=request.user, sound=sound, category=None).first()
     add_bookmark_url = '/'.join(
         request.build_absolute_uri(reverse('add-bookmark', args=[sound_id])).split('/')[:-2]) + '/'
+    print("bookmark form")
+    
     tvars = {
-        'bookmarks': Bookmark.objects.filter(user=request.user, sound=sound).exists(),
+        'bookmarks': Bookmark.objects.filter(user=request.user, sound=sound),
         'sound_id': sound.id,
         'sound_is_moderated_and_processed_ok': sound.moderated_and_processed_ok,
         'form': form,
-        'sound_has_bookmark_without_category': sound_has_bookmark_without_category,
-        'categories_aready_containing_sound': categories_already_containing_sound,
+        'bookmark_without_category': bookmark_without_category,
         'add_bookmark_url': add_bookmark_url
     }
+    print(tvars['bookmarks'])
     return render(request, 'bookmarks/modal_bookmark_sound.html', tvars)
diff --git a/freesound/settings.py b/freesound/settings.py
@@ -847,6 +847,9 @@
 # Important: place settings which depend on other settings potentially modified in local_settings.py BELOW the import
 from .local_settings import *
 
+CACHES['default'] = {
+    'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+}
 
 # -------------------------------------------------------------------------------
 # Celery
diff --git a/sounds/views.py b/sounds/views.py
@@ -49,6 +49,7 @@
 from django_ratelimit.decorators import ratelimit
 
 from accounts.models import Profile
+from bookmarks.models import Bookmark
 from comments.forms import CommentForm
 from comments.models import Comment
 from donations.models import DonationsModalSettings
@@ -258,6 +259,7 @@ def sound(request, username, sound_id):
     display_random_link = request.GET.get('random_browsing', False)
     is_following = request.user.is_authenticated and follow_utils.is_user_following_user(request.user, sound.user)
     is_explicit = sound.is_explicit and (not request.user.is_authenticated or not request.user.profile.is_adult)
+    sound_is_bookmarked = request.user.is_authenticated and Bookmark.objects.filter(user=request.user, sound=sound).exists()
 
     tvars = {
         'sound': sound,
@@ -267,7 +269,8 @@ def sound(request, username, sound_id):
         'is_following': is_following,
         'is_explicit': is_explicit,  # if the sound should be shown blurred, already checks for adult profile
         'sizes': settings.IFRAME_PLAYER_SIZE,
-        'min_num_ratings': settings.MIN_NUMBER_RATINGS
+        'min_num_ratings': settings.MIN_NUMBER_RATINGS,
+        'sound_is_bookmarked': sound_is_bookmarked,
     }
     tvars.update(paginate(request, qs, settings.SOUND_COMMENTS_PER_PAGE))
     return render(request, 'sounds/sound.html', tvars)
diff --git a/templates/bookmarks/modal_bookmark_sound.html b/templates/bookmarks/modal_bookmark_sound.html
@@ -31,14 +31,17 @@ <h4 class="v-spacing-5">Bookmark this sound</h4>
     <div class="v-spacing-4">
         {% if bookmarks %}
             <div class="v-spacing-4 text-grey">
-            {% bw_icon 'bookmark-filled' %}This sound is already in your bookmarks{% if not categories_aready_containing_sound %} under no category{% endif %}
-            {% if categories_aready_containing_sound %}
-                under the categories:
-                {% if sound_has_bookmark_without_category %}
-                    <span class="text-black">Uncategorized</span>, 
-                {% endif %}
-                {% for cat in categories_aready_containing_sound %}
-                    <span class="text-black">{{cat.name}}</span>{% if not forloop.last %}, {% endif %}
+            {% bw_icon 'bookmark-filled' %}This sound is already in your bookmarks
+            {% if bookmark_without_category %}
+                under:
+                {% for bookmark in bookmarks %}
+                    <div class="bookmark-category">
+                        <span class="text-black">{{bookmark.category_name_or_uncategorized}}</span>
+                        <form action="{% url 'delete-bookmark' bookmark.id %}" method="post" style="display: inline;">
+                            {% csrf_token %}
+                            <button type="submit" class="btn-small btn-secondary">Remove</button>
+                        </form>
+                    </div>
                 {% endfor %}
             {% endif %}
             </div>
diff --git a/templates/sounds/sound.html b/templates/sounds/sound.html
@@ -72,9 +72,15 @@ <h1><a class="bw-link--black" href="{% url 'sound' sound.user.username sound.id
                                     </button>
                                     {% endif %}
                                     <span class="h-spacing-left-1"></span>
+                                    {% if sound_is_bookmarked %}
+                                    <button title="Sound is bookmarked" aria-label="Sound is bookmarked - open dialog to edit or remove" class="btn-neutral" data-toggle="bookmark-modal" data-modal-url="{% url 'bookmarks-add-form-for-sound' sound.id %}" data-add-bookmark-url="{% url 'add-bookmark' sound.id %}">
+                                        {% bw_icon 'bookmark-filled' %}
+                                    </button>
+                                    {% else %}
                                     <button title="Bookmark this sound" aria-label="Bookmark this sound" class="btn-neutral" data-toggle="bookmark-modal" data-modal-url="{% url 'bookmarks-add-form-for-sound' sound.id %}" data-add-bookmark-url="{% url 'add-bookmark' sound.id %}">
                                         {% bw_icon 'bookmark' %}
                                     </button>
+                                    {% endif %}
                                 </div>
                             </div>
                         </div>
