Merge remote-tracking branch 'upstream/master' into issue1755

accounts/urls.py

@@ -95,6 +95,8 @@
     path('bookmarks/get_form_for_sound/<int:sound_id>/', bookmarks.get_form_for_sound, name="bookmarks-add-form-for-sound"),
     path('bookmarks/category/<int:category_id>/delete/', bookmarks.delete_bookmark_category, name="delete-bookmark-category"),
     path('bookmarks/<int:bookmark_id>/delete/', bookmarks.delete_bookmark, name="delete-bookmark"),
+    path('bookmarks/category/<int:category_id>/edit_modal/', bookmarks.edit_bookmark_category, name="edit-bookmark-category"),
+
 
     path('messages/', messages.inbox, name='messages'),
     path('messages/sent/', messages.sent_messages, name='messages-sent'),

bookmarks/forms.py

@@ -30,7 +30,15 @@ class Meta:
         widgets = {
             'name': forms.TextInput(attrs={'class': 'category_name_widget'}),
         }
+
+    def clean(self):
+        cleaned_data = super().clean()
+        name = self.cleaned_data.get("name", )
 
+        if BookmarkCategory.objects.filter(user=self.instance.user, name=name).exists():
+            raise forms.ValidationError("This name already exists for a bookmark category")
+
+        return cleaned_data
 
 class BookmarkForm(forms.Form):
     category = forms.ChoiceField(

bookmarks/views.py

@@ -27,7 +27,7 @@
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 
-from bookmarks.forms import BookmarkForm
+from bookmarks.forms import BookmarkForm, BookmarkCategoryForm
 from bookmarks.models import Bookmark, BookmarkCategory
 from sounds.models import Sound
 from utils.pagination import paginate
@@ -85,6 +85,33 @@ def delete_bookmark_category(request, category_id):
         return HttpResponseRedirect(reverse("bookmarks-for-user", args=[request.user.username]))
 
 
+@transaction.atomic()
+def edit_bookmark_category(request, category_id):
+
+    if not request.GET.get('ajax'):
+        return HttpResponseRedirect(reverse("bookmarks-for-user", args=[request.user.username]))
+
+    category = get_object_or_404(BookmarkCategory, id=category_id, user=request.user)
+
+    if request.method == "POST":
+        edit_form = BookmarkCategoryForm(request.POST, instance=category)
+        print(edit_form.is_bound)
+        if edit_form.is_valid():      
+            category.name = edit_form.cleaned_data["name"]
+            category.save()
+            return JsonResponse({"success":True})
+        if not edit_form.is_valid():
+            print(edit_form.errors.as_json())
+    else:
+        initial = {"name":category.name}
+        edit_form = BookmarkCategoryForm(initial=initial)
+
+    tvars = {"category": category,
+            "form": edit_form}
+    return render(request, 'bookmarks/modal_edit_bookmark_category.html', tvars)
+
+
+
 @login_required
 @transaction.atomic()
 def add_bookmark(request, sound_id):

docker-compose.test.yml

@@ -1,13 +1,13 @@
-version: "3.7"
+volumes:
+    pgdata:
 
 services:
     db:
         image: postgres:12.1
-        volumes:
-            - pgdata:/var/lib/postgresql/data
         env_file:
             - environment
         volumes:
+            - pgdata:/var/lib/postgresql/data
             - ./freesound-data/db_dev_dump:/freesound-data/db_dev_dump
         ports:
             - "5432:5432"

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 volumes:
     pgdata:
     m2home:

freesound/static/bw-frontend/src/components/loginModals.js

@@ -129,7 +129,7 @@ const handleRegistrationModal = () => {
     // If registration succeeded, redirect to the registration feedback page
     const data = JSON.parse(req.responseText);
     window.location.href = data.redirectURL;
-  }, undefined);
+  }, undefined, undefined);
 }
 
 const handleRegistrationFeedbackModal = () => {

freesound/static/bw-frontend/src/components/modal.js

@@ -85,19 +85,22 @@ const bindConfirmationModalElements = (container) => {
 
 // Logic to bind default modals
 
-const handleDefaultModal = (modalUrl, modalActivationParam, atPage) => {
-  if ((atPage !== undefined) && modalUrl.indexOf('&page') == -1){
-    modalUrl += '&page=' + atPage;
-  }
+const handleDefaultModal = (modalUrl, modalActivationParam) => {
   handleGenericModal(modalUrl, undefined, undefined, true, true, modalActivationParam);
 }
 
+const handleDefaultModalWithForm = (modalUrl, modalActivationParam) => {
+  handleGenericModalWithForm(modalUrl, undefined, undefined, (req) => {showToast('Form submitted succesfully!')}, undefined, true, true, modalActivationParam, true);
+}
+
 const bindDefaultModals = (container) => {
   bindModalActivationElements('[data-toggle="modal-default"]', handleDefaultModal, container);
+  bindModalActivationElements('[data-toggle="modal-default-with-form"]', handleDefaultModalWithForm, container);
 }
 
 const activateDefaultModalsIfParameters = () => {
   activateModalsIfParameters('[data-toggle="modal-default"]', handleDefaultModal);
+  activateModalsIfParameters('[data-toggle="modal-default-with-form"]', handleDefaultModalWithForm);
 }
 
 
@@ -195,7 +198,7 @@ const handleGenericModal = (fetchContentUrl, onLoadedCallback, onClosedCallback,
 };
 
 
-const handleGenericModalWithForm = (fetchContentUrl, onLoadedCallback, onClosedCallback, onFormSubmissionSucceeded, onFormSubmissionError, doRequestAsync, showLoadingToast, modalActivationParam) => {
+const handleGenericModalWithForm = (fetchContentUrl, onLoadedCallback, onClosedCallback, onFormSubmissionSucceeded, onFormSubmissionError, doRequestAsync, showLoadingToast, modalActivationParam, dataReloadOnSuccess) => {
   // This version of the generic modal is useful for modal contents that contain forms which, upon submission, will return HTML content if there were form errors
   // which should be used to replace the current contents of the form, and will return a JSON response if the form validated correctly in the backend. That JSON
   // response could include some relevant data or no data at all, but is used to differentiate from the HTML response
@@ -218,6 +221,9 @@ const handleGenericModalWithForm = (fetchContentUrl, onLoadedCallback, onClosedC
           if (onFormSubmissionSucceeded !== undefined){
             onFormSubmissionSucceeded(req);
           }
+          if(dataReloadOnSuccess == true){
+            location.reload()
+          }
         }  else {
           // If the response is not JSON, that means the response are the HTML elements of the
           // form (including error warnings) and we should replace current modal HTML with this one
@@ -278,4 +284,4 @@ const handleGenericModalWithForm = (fetchContentUrl, onLoadedCallback, onClosedC
   }, onClosedCallback, doRequestAsync, showLoadingToast, modalActivationParam)
 }
 
-export {activateModal, dismissModal, handleGenericModal, handleGenericModalWithForm, handleDefaultModal, bindModalActivationElements, bindConfirmationModalElements, activateModalsIfParameters, bindDefaultModals, activateDefaultModalsIfParameters};
+export {activateModal, dismissModal, handleGenericModal, handleGenericModalWithForm, handleDefaultModal, handleDefaultModalWithForm, bindModalActivationElements, bindConfirmationModalElements, activateModalsIfParameters, bindDefaultModals, activateDefaultModalsIfParameters};

freesound/static/bw-frontend/src/pages/moderation.js

@@ -19,6 +19,7 @@ const messageTextArea = document.getElementsByName('message')[0];
 const ticketIdsInput = document.getElementsByName('ticket')[0];
 const soundInfoElementsPool = document.getElementById('sound-info-elements');
 const selectedSoundsInfoPanel = document.getElementById('selected-sounds-info');
+const ticketCommentsSection = document.getElementById('ticket-comments-section');
 
 
 const closeCollapsableBlocks = (soundElement) => {
@@ -70,6 +71,15 @@ const postTicketsSelected = () => {
         }
     }
 
+    // Make ticket comments visible if only one ticket is selected
+    ticketCommentsSection.children.forEach(commentElement => {
+        commentElement.classList.add('display-none');
+    });
+    if (selectedTicketsData.length === 1) {
+        const commentElement = ticketCommentsSection.querySelector(`.ticket-comments[data-ticket-id="${selectedTicketsData[0]['ticketId']}"]`);
+        commentElement.classList.remove('display-none');
+    } 
+
     // Set "ticket" field in moderation form with the ticket ids of the selected tickets
     const ticketIdsSerialized = selectedTicketsData.map(ticketData => ticketData['ticketId']).join('|');
     ticketIdsInput.value = ticketIdsSerialized;

freesound/static/bw-frontend/src/pages/sound.js

@@ -137,7 +137,7 @@ const initSoundFlagForm = (modalContainer) => {
 }
 
 const handleFlagSoundModal = () => {
-    handleGenericModalWithForm(flagSoundButton.dataset.modalContentUrl, initSoundFlagForm, undefined, (req) => {showToast('Sound flagged successfully!')}, undefined);  
+    handleGenericModalWithForm(flagSoundButton.dataset.modalContentUrl, initSoundFlagForm, undefined, (req) => {showToast('Sound flagged successfully!')}, undefined, undefined);  
 }
 
 if (flagSoundModalParamValue) {

templates/bookmarks/bookmarks.html

@@ -20,6 +20,7 @@ <h4>Bookmark categories</h4>
                             <li><a href="{% url "bookmarks-for-user-for-category" user.username cat.id %}" {% if category.id == cat.id %}style="font-weight:bold"{% endif %} aria-label="Category: {{cat.name}}">{{cat.name}}</a> <span class="text-grey"> · {{cat.num_bookmarks|bw_intcomma}} bookmark{{ cat.num_bookmarks|pluralize }}</span>
                             {% if is_owner %}
                             <a class="cursor-pointer h-spacing-left-1" data-toggle="confirmation-modal" data-modal-confirmation-title="Are you sure you want to remove this bookmark category?" data-modal-confirmation-help-text="Note that all the bookmarks inside this category will also be removed" data-modal-confirmation-url="{% url "delete-bookmark-category" cat.id %}{% if cat.id != category.id %}?next={{request.path}}&page={{current_page}}{% endif %}" title="Remove bookmark category" aria-label="Remove bookmark category">{% bw_icon 'trash' %}</a>
+                            <a class="cursor-pointer h-spacing-left-1" data-toggle="modal-default-with-form" data-modal-content-url="{% url 'edit-bookmark-category' cat.id %}?ajax=1" title="Edit bookmark category" aria-label="Edit bookmark category">{% bw_icon 'edit' %}</a>
                             {% endif %}</li>
                         {% endfor %}
                     </ul>
@@ -39,7 +40,7 @@ <h4><span class="text-light-grey">Category:</span> {% if category %}{{category.n
                             <div class="col-6 col-md-4">
                                 {% display_sound_small bookmark.sound %}                     
                                 {% if is_owner %}
-                                    <div class="right v-spacing-4 v-spacing-top-negative-2"><a class="cursor-pointer bw-link--grey" data-toggle="confirmation-modal" data-modal-confirmation-title="Are you sure you want to remove this bookmark from '{{bookmark.category_name_or_uncategorized}}'?" data-modal-confirmation-url="{% url "delete-bookmark" bookmark.id %}?next={{request.path}}&page={{current_page}}" title="Remove from bookmarks" aria-label="Remove from bookmarks">{% bw_icon 'trash' %} Remove bookmark</a></div>
+                                    <div class="right v-spacing-4 v-spacing-top-negative-2"><a class="cursor-pointer bw-link--grey" data-toggle="confirmation-modal" data-modal-confirmation-title="Are you sure you want to remove this bookmark from '{{bookmark.category_name_or_uncategorized}}'?" data-modal-confirmation-url="{% url "delete-bookmark" bookmark.id %}?next={{request.path}}&page={{current_page}}" title="Remove from bookmarks" aria-label="Remove from bookmarks">{% bw_icon 'trash' %} Remove bookmark</a></div>                                        
                                 {% endif %}
                             </div>
                         {% endfor %}

templates/bookmarks/modal_edit_bookmark_category.html

@@ -0,0 +1,21 @@
+{% extends "molecules/modal_base.html" %}
+{% load util %}
+
+{% block id %}editBookMarkCategory{% endblock %}
+{% block extra-class %}{% endblock %}
+{% block aria-label %}Edit Bookmark Category{% endblock %}
+
+{% block body %}
+<div class="col-12">
+    <div class="text-center">
+        <h4 class="v-spacing-5">Edit bookmark Category</h4>
+        <form method="post" action="{% url 'edit-bookmark-category' category.id %}?ajax=1." class = "disable-on-submit">{% csrf_token %}
+            {{form}}
+            <button class="btn-primary v-spacing-top-3">Change bookmark category name</button>
+        </form>
+    </div>
+    <div class="v-spacing-4">
+
+    </div>
+</div>
+{% endblock %}

templates/moderation/assigned.html

@@ -75,6 +75,28 @@ <h5>No sound tickets in your queue... &#128522</h5>
                         <br>You can do shift+click on a row to select all the rows since the last previously selected row
                     </div>
                 </div>
+                <div id="ticket-comments-section">
+                    {% for ticket in page.object_list %}
+                    <div class="ticket-comments" data-ticket-id="{{ ticket.id }}" class="v-spacing-4 display-none">
+                        {% with ticket.messages.all as ticket_messages %}
+                        {% if ticket_messages.count > 0 %}
+                            <h4 class="v-spacing-2 text-grey">Messages for ticket #{{ ticket.id }}</h4>
+                            {% for message in ticket_messages reversed %}
+                                {% if not message.moderator_only or can_view_moderator_only_messages %}
+                                <div class="v-spacing-2">
+                                    <div>
+                                        {% if message.sender %} <a href="{% url "account" message.sender.username %}">{{ message.sender.username }}</a> {% else %} Anonymous {% endif %}<span class="h-spacing-left-1 h-spacing-1 text-grey">·</span><span class="text-grey">{{ message.created }}</span>
+                                        {% if message.moderator_only %}<span title="This message is only visible to other moderators" class="text-blue">{% bw_icon 'notification' 'rotate180' %}</span>{% endif %}
+                                    </div>
+                                    <div class="{% if message.moderator_only %}text-blue{%endif%} overflow-hidden">{{ message.text|safe|linebreaksbr }}</div>
+                                </div>
+                                {% endif %}
+                            {% endfor %}
+                        {% endif %}
+                        {% endwith %}
+                    </div>
+                    {%endfor%}
+                </div>
             {% endif %}
             </div>
         </div>

tickets/views.py

@@ -636,7 +636,8 @@ def moderation_assigned(request, user_id):
         "current_page": pagination_response['current_page'],
         "show_pagination": show_pagination,
         "mod_sound_form": mod_sound_form,
-        "msg_form": msg_form
+        "msg_form": msg_form,
+        "can_view_moderator_only_messages": _can_view_mod_msg(request)
     }
     _add_sound_objects_to_tickets(tvars['page'].object_list)
     tvars.update({'section': 'assigned'})