Merge staging into production, 2024 Feb 22 edition

config/nginx/conf.d/cantusdb.conf.production

@@ -1,22 +1,26 @@
 server {
+    # Redirect all http traffic to corresponding canonical https page
     listen 80;
 
+    server_name cantusdatabase.org www.cantusdatabase.org mass.cantusdatabase.org;
+
     server_tokens off;
 
     location ^~ /.well-known/acme-challenge/ {
         root /var/www/lego;
     }
 
     location / {
-        return 301 https://$host$request_uri;
+        return 301 https://cantusdatabase.org$request_uri;
     }
 }
 
 server {
-    # Redirect all https traffic for mass.cantusdatabase.org to cantusdatabase.org
+    # Redirect all https traffic for www.cantusdatabase.org and mass.cantusdatabase.org
+    # to cantusdatabase.org
     listen 443 ssl;
 
-    server_name mass.cantusdatabase.org;
+    server_name www.cantusdatabase.org mass.cantusdatabase.org;
 
     ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
     ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;
@@ -27,8 +31,9 @@ server {
 }
 
 server {
-
     listen 443 default_server http2 ssl;
+
+    server_name cantusdatabase.org;
 
     ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
     ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;

config/nginx/conf.d/cantusdb.conf.staging

@@ -1,14 +1,17 @@
 server {
+    # redirect all http traffic to corresponding canonical https page
     listen 80;
 
+    server_name staging.cantusdatabase.org staging-alias.cantusdatabase.org;
+
     server_tokens off;
 
     location ^~ /.well-known/acme-challenge/ {
         root /var/www/lego;
     }
 
     location / {
-        return 301 https://$host$request_uri;
+        return 301 https://staging.cantusdatabase.org$request_uri;
     }
 }
 
@@ -32,8 +35,9 @@ server {
 }
 
 server {
-
     listen 443 default_server http2 ssl;
+
+    server_name staging.cantusdatabase.org;
 
     # ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
     # ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;

django/cantusdb_project/main_app/permissions.py

@@ -82,12 +82,31 @@ def user_can_view_sequence(user: User, sequence: Sequence) -> bool:
     return (source is not None) and ((source.published) or (user_is_authenticated))
 
 
-def user_can_edit_sequences(user: User) -> bool:
+def user_can_edit_sequences(user: User, sequence: Sequence) -> bool:
     """
     Checks if the user has permission to edit a Sequence object.
     Used in SequenceDetail and SequenceEdit views.
     """
-    return user.groups.filter(name="project manager").exists()
+    source = sequence.source
+    if user.is_anonymous or (source is None):
+        return False
+
+    source_id = source.id
+    user_is_assigned_to_source: bool = user.sources_user_can_edit.filter(
+        id=source_id
+    ).exists()
+
+    user_is_project_manager: bool = user.groups.filter(name="project manager").exists()
+    user_is_editor: bool = user.groups.filter(name="editor").exists()
+    user_is_contributor: bool = user.groups.filter(name="contributor").exists()
+
+    return (
+        (user_is_project_manager)
+        or (user_is_editor and user_is_assigned_to_source)
+        or (user_is_editor and source.created_by == user)
+        or (user_is_contributor and user_is_assigned_to_source)
+        or (user_is_contributor and source.created_by == user)
+    )
 
 
 def user_can_create_sources(user: User) -> bool:

django/cantusdb_project/main_app/templates/chant_detail.html

@@ -197,14 +197,12 @@ <h3>{{ chant.incipit }}</h3>
                                 <p><small>Syllabification is based on saved syllabized text.</small></p>
                             {% endif %}
                             <dd>
-                                {% for zip in syllabized_text_with_melody %}
-                                    {% for syl_mel, syl_text in zip %}
-                                        <span style="float: left">
-                                            <div style="font-family: volpiano; font-size: 36px">{{ syl_mel }}</div>
-                                            <!-- "mt" is margin at the top, so that the lowest note in volpiano don't overlap with text -->
-                                            <div class="mt-2" style="font-size: 12px; "><pre>{{ syl_text }}</pre></div>
-                                        </span>
-                                    {% endfor %}
+                                {% for syl_text, syl_mel in syllabized_text_with_melody %}
+                                    <span style="float: left">
+                                        <div style="font-family: volpiano; font-size: 36px">{{ syl_mel }}</div>
+                                        <!-- "mt" is margin at the top, so that the lowest note in volpiano don't overlap with text -->
+                                        <div class="mt-2" style="font-size: 12px; "><pre>{{ syl_text }}</pre></div>
+                                    </span>
                                 {% endfor %}
                             </dd>
                         </div>

django/cantusdb_project/main_app/templates/chant_edit.html

@@ -218,14 +218,12 @@
                                     <p><small>Syllabification is based on saved syllabized text.</small></p>
                                 {% endif %}
                                 <dd>
-                                    {% for zip in syllabized_text_with_melody %}
-                                        {% for syl_mel, syl_text in zip %}
-                                            <span style="float: left">
-                                                <div style="font-family: volpiano; font-size: 36px">{{ syl_mel }}</div>
-                                                <!-- "mt" is margin at the top, so that the lowest note in volpiano don't overlap with text -->
-                                                <div class="mt-2" style="font-size: 12px; "><pre>{{ syl_text }}</pre></div>
-                                            </span>
-                                        {% endfor %}
+                                    {% for syl_text, syl_mel in syllabized_text_with_melody %}
+                                        <span style="float: left">
+                                            <div style="font-family: volpiano; font-size: 36px">{{ syl_mel }}</div>
+                                            <!-- "mt" is margin at the top, so that the lowest note in volpiano don't overlap with text -->
+                                            <div class="mt-2" style="font-size: 12px; "><pre>{{ syl_text }}</pre></div>
+                                        </span>
                                     {% endfor %}
                                 </dd>
                             </div>

django/cantusdb_project/main_app/templates/chant_syllabification_edit.html

@@ -59,14 +59,12 @@ <h3>Edit Syllabification</h3>
                                 <small>Syllabification is based on saved syllabized text.</small>
                                 <br>
                             {% endif %}
-                            {% for zip in syllabized_text_with_melody %}
-                                {% for syl_mel, syl_text in zip %}
-                                    <span style="float: left">
-                                        <div style="font-family: volpiano; font-size: 28px">{{ syl_mel }}</div>
-                                        <!-- "mt" is margin at the top, so that the lowest note in volpiano don't overlap with text -->
-                                        <div class="mt-2" style="font-size: 10px"><pre>{{ syl_text }}</pre></div>
-                                    </span>
-                                {% endfor %}
+                            {% for syl_text, syl_mel in syllabized_text_with_melody %}
+                                <span style="float: left">
+                                    <div style="font-family: volpiano; font-size: 28px">{{ syl_mel }}</div>
+                                    <!-- "mt" is margin at the top, so that the lowest note in volpiano don't overlap with text -->
+                                    <div class="mt-2" style="font-size: 10px"><pre>{{ syl_text }}</pre></div>
+                                </span>
                             {% endfor %}
                         </div>
                     </div>