default_config.py

@@ -14,12 +14,6 @@ MAX_ONLINE_QUERIES=3
 # Disable registration of new users via /auth/register (they can still be added by root)
 DISABLE_REGISTER=False
 
-# Disable account deletion for users (still possible for admins)
-DISABLE_ACCOUNT_DELETION=False
-
-# Set this to True if you want local search to be across all albums (not just those the user belong to)
-PRIVATE_SEARCH=False
-
 # Front URL of the application (for QRCodes generation)
 BASE_URL="http://localhost:5000"
 

partitioncloud/modules/admin.py

@@ -50,8 +50,7 @@ def user_inspect(user_id):
         "settings/index.html",
         skip_old_password=True,
         inspected_user=inspected_user,
-        user=current_user,
+        user=current_user
-        deletion_allowed=True
     )
 
 

partitioncloud/modules/albums.py

@@ -43,18 +43,12 @@ def search_page():
         flash(_("Missing search query"))
         return redirect("/albums")
 
-    user = User(user_id=session.get("user_id"))
-
     query = request.form["query"]
     nb_queries = abs(int(request.form["nb-queries"]))
     search.flush_cache(current_app.instance_path)
-    
+    partitions_local = search.local_search(query, utils.get_all_partitions())
-    partitions_list = None
+
-    if current_app.config["PRIVATE_SEARCH"]:
+    user = User(user_id=session.get("user_id"))
-        partitions_list = utils.get_all_partitions()
-    else:
-        partitions_list = user.get_accessible_partitions()
-    partitions_local = search.local_search(query, partitions_list)
 
     if nb_queries > 0:
         if user.access_level != 1:

partitioncloud/modules/classes/user.py

@@ -33,7 +33,6 @@ class User():
         self.albums = None
         self.groupes = None
         self.partitions = None
-        self.accessible_partitions = None
         self.max_queries = 0
 
         db = get_db()
@@ -170,44 +169,6 @@ class User():
                 ).fetchall()
         return self.partitions
 
-    def get_accessible_partitions(self, force_reload=False):
-        if self.accessible_partitions is None or force_reload:
-            db = get_db()
-            if self.access_level == 1:
-                self.accessible_partitions = db.execute(
-                    """
-                    SELECT * FROM partition
-                    """
-                ).fetchall()
-            else:
-                self.accessible_partitions = db.execute(
-                    """
-                    SELECT partition.uuid, partition.name,
-                        partition.author, partition.body,
-                        partition.user_id, partition.source
-                    FROM partition
-                        JOIN album
-                        JOIN contient_partition
-                        ON album.id=album_id
-                        AND partition.uuid=partition_uuid
-                    WHERE album.id IN (
-                        SELECT album.id FROM album
-                        JOIN contient_user
-                        ON contient_user.user_id=?
-                        AND album_id=album.id
-                    UNION
-                        SELECT album.id FROM album
-                        JOIN groupe_contient_user
-                        JOIN groupe_contient_album
-                        ON groupe_contient_user.user_id=?
-                        AND groupe_contient_album.album_id=album.id
-                        AND groupe_contient_user.groupe_id=groupe_contient_album.groupe_id
-                    )
-                    """,
-                    (self.id, self.id,),
-                ).fetchall()
-        return self.accessible_partitions
-
     def join_album(self, album_uuid):
         db = get_db()
         album = Album(uuid=album_uuid)

partitioncloud/modules/settings.py

@@ -27,8 +27,7 @@ def index():
     return render_template(
         "settings/index.html",
         inspected_user=user,
-        user=user,
+        user=user
-        deletion_allowed=not current_app.config["DISABLE_ACCOUNT_DELETION"]
     )
 
 
@@ -49,10 +48,6 @@ def delete_account():
         if cur_user.id != mod_user.id:
             flash(_("Missing rights."))
             return redirect(request.referrer)
-
-        if current_app.config["DISABLE_ACCOUNT_DELETION"]:
-            flash(_("You are not allowed to delete your account."))
-            return redirect(request.referrer)
     else:
         log_data = [mod_user.username, mod_user.id, cur_user.username]
 

partitioncloud/templates/settings/index.html

@@ -35,9 +35,8 @@
     <input type="hidden" id="user_id" name="user_id" value="{{ inspected_user.id }}">
     <input type="Submit" value="{{ _('confirm') }}">
 </form>
-{% if deletion_allowed %}
+
-  <h3>{{ _("Delete account") }}</h3>
+<h3>{{ _("Delete account") }}</h3>
-  <a href="#delete-account"><button class="red-confirm">{{ _("Delete account") }}</button></a>
+<a href="#delete-account"><button class="red-confirm">{{ _("Delete account") }}</button></a>
-{% endif %}
 
 {% endblock %}

partitioncloud/translations/en/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-29 12:44+0100\n"
+"POT-Creation-Date: 2024-02-25 15:18+0100\n"
 "PO-Revision-Date: 2024-01-22 15:38+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -28,91 +28,87 @@ msgstr "Created user %(username)s"
 msgid "This album does not exists, but user %(username)s has been created"
 msgstr "This album does not exists, but user %(username)s has been created"
 
-#: partitioncloud/modules/albums.py:43
+#: partitioncloud/modules/albums.py:41
 msgid "Missing search query"
 msgstr "Missing search query"
 
-#: partitioncloud/modules/albums.py:125 partitioncloud/modules/groupe.py:71
+#: partitioncloud/modules/albums.py:123 partitioncloud/modules/groupe.py:71
 #: partitioncloud/modules/groupe.py:185
 msgid "Missing name."
 msgstr "Missing name."
 
-#: partitioncloud/modules/albums.py:162
+#: partitioncloud/modules/albums.py:160
 msgid "This album does not exist."
 msgstr "This album does not exist."
 
-#: partitioncloud/modules/albums.py:165
+#: partitioncloud/modules/albums.py:163
 msgid "Album added to collection."
 msgstr "Album added to collection."
 
-#: partitioncloud/modules/albums.py:179 partitioncloud/modules/albums.py:242
+#: partitioncloud/modules/albums.py:177 partitioncloud/modules/albums.py:240
-#: partitioncloud/modules/albums.py:354
+#: partitioncloud/modules/albums.py:346
 msgid "You are not a member of this album"
 msgstr "You are not a member of this album"
 
-#: partitioncloud/modules/albums.py:183
+#: partitioncloud/modules/albums.py:181
 msgid "You are alone here, quitting means deleting this album."
 msgstr "You are alone here, quitting means deleting this album."
 
-#: partitioncloud/modules/albums.py:187
+#: partitioncloud/modules/albums.py:185
 msgid "Album quitted."
 msgstr "Album quitted."
 
-#: partitioncloud/modules/albums.py:206
+#: partitioncloud/modules/albums.py:204
 msgid "You are not alone in this album."
 msgstr "You are not alone in this album."
 
-#: partitioncloud/modules/albums.py:208
+#: partitioncloud/modules/albums.py:206
 msgid "You don't own this album."
 msgstr "You don't own this album."
 
-#: partitioncloud/modules/albums.py:219
+#: partitioncloud/modules/albums.py:217
 msgid "Album deleted."
 msgstr "Album deleted."
 
-#: partitioncloud/modules/albums.py:248 partitioncloud/modules/partition.py:153
+#: partitioncloud/modules/albums.py:246 partitioncloud/modules/partition.py:153
 #: partitioncloud/modules/partition.py:199
 msgid "Missing title"
 msgstr "Missing title"
 
-#: partitioncloud/modules/albums.py:250 partitioncloud/modules/partition.py:63
+#: partitioncloud/modules/albums.py:248 partitioncloud/modules/partition.py:63
 msgid "Missing file"
 msgstr "Missing file"
 
-#: partitioncloud/modules/albums.py:262
+#: partitioncloud/modules/albums.py:260
 msgid "Search results expired"
 msgstr "Search results expired"
 
-#: partitioncloud/modules/albums.py:272
+#: partitioncloud/modules/albums.py:326
-msgid "Invalid PDF file"
-msgstr ""
-
-#: partitioncloud/modules/albums.py:334
 #, python-format
 msgid "Score %(partition_name)s added"
 msgstr "Score %(partition_name)s added"
 
-#: partitioncloud/modules/albums.py:348
+#: partitioncloud/modules/albums.py:340
 msgid "Selecting an album is mandatory."
 msgstr "Selecting an album is mandatory."
 
-#: partitioncloud/modules/albums.py:350
+#: partitioncloud/modules/albums.py:342
 msgid "Selecting a score is mandatory."
 msgstr "Selecting a score is mandatory."
 
-#: partitioncloud/modules/albums.py:352
+#: partitioncloud/modules/albums.py:344
 msgid "Please specify a score type."
 msgstr "Please specify a score type."
 
-#: partitioncloud/modules/albums.py:374
+#: partitioncloud/modules/albums.py:366
 msgid "Score added"
 msgstr "Score added"
 
-#: partitioncloud/modules/albums.py:376
+#: partitioncloud/modules/albums.py:368
 msgid "Score is already in the album."
 msgstr "Score is already in the album."
 
-#: partitioncloud/modules/albums.py:388
+#: partitioncloud/modules/albums.py:380
 msgid "Unknown score type."
 msgstr "Unknown score type."
 
@@ -120,8 +116,8 @@ msgstr "Unknown score type."
 msgid "You need to login to access this resource."
 msgstr "You need to login to access this resource."
 
-#: partitioncloud/modules/auth.py:59 partitioncloud/modules/settings.py:50
+#: partitioncloud/modules/auth.py:59 partitioncloud/modules/settings.py:46
-#: partitioncloud/modules/settings.py:82
+#: partitioncloud/modules/settings.py:69
 msgid "Missing rights."
 msgstr "Missing rights."
 
@@ -129,7 +125,7 @@ msgstr "Missing rights."
 msgid "Missing username."
 msgstr "Missing username."
 
-#: partitioncloud/modules/auth.py:87 partitioncloud/modules/settings.py:96
+#: partitioncloud/modules/auth.py:87 partitioncloud/modules/settings.py:81
 msgid "Missing password."
 msgstr "Missing password."
 
@@ -222,31 +218,27 @@ msgstr "You are not allowed to delete this score."
 msgid "Score deleted."
 msgstr "Score deleted."
 
-#: partitioncloud/modules/settings.py:40 partitioncloud/modules/settings.py:72
+#: partitioncloud/modules/settings.py:37 partitioncloud/modules/settings.py:60
 msgid "Missing user id."
 msgstr "Missing user id."
 
-#: partitioncloud/modules/settings.py:54
+#: partitioncloud/modules/settings.py:50
-msgid "You are not allowed to delete your account."
-msgstr "You are not allowed to delete your account."
-
-#: partitioncloud/modules/settings.py:60
 msgid "User successfully deleted."
 msgstr "User successfully deleted."
 
-#: partitioncloud/modules/settings.py:86
+#: partitioncloud/modules/settings.py:73
 msgid "Missing old password."
 msgstr "Missing old password."
 
-#: partitioncloud/modules/settings.py:90
+#: partitioncloud/modules/settings.py:77
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: partitioncloud/modules/settings.py:100
+#: partitioncloud/modules/settings.py:85
 msgid "Password and its confirmation differ."
 msgstr "Password and its confirmation differ."
 
-#: partitioncloud/modules/settings.py:104
+#: partitioncloud/modules/settings.py:89
 msgid "Successfully updated password."
 msgstr "Successfully updated password."
 
@@ -412,7 +404,6 @@ msgstr "Do you really want to delete this album?"
 #: partitioncloud/templates/partition/delete.html:10
 #: partitioncloud/templates/partition/details.html:86
 #: partitioncloud/templates/partition/edit.html:57
-#: partitioncloud/templates/settings/index.html:19
 msgid "Delete"
 msgstr "Delete"
 
@@ -655,47 +646,3 @@ msgstr "Modify \"%(name)s\""
 msgid "Source"
 msgstr "Source"
 
-#: partitioncloud/templates/settings/index.html:3
-msgid "Settings"
-msgstr "Settings"
-
-#: partitioncloud/templates/settings/index.html:8
-#: partitioncloud/templates/settings/index.html:39
-#: partitioncloud/templates/settings/index.html:40
-msgid "Delete account"
-msgstr "Delete account"
-
-#: partitioncloud/templates/settings/index.html:15
-#, python-format
-msgid ""
-"Do you really want to delete %(username)s's account ? This action is "
-"%(irreversible_bold)s."
-msgstr ""
-"Do you really want to delete %(username)s's account ? This action is "
-"%(irreversible_bold)s."
-
-#: partitioncloud/templates/settings/index.html:27
-#, python-format
-msgid "User %(username)s has %(album_count)s albums"
-msgstr "User %(username)s has %(album_count)s albums"
-
-#: partitioncloud/templates/settings/index.html:29
-msgid "Change password"
-msgstr "Change password"
-
-#: partitioncloud/templates/settings/index.html:31
-msgid "old password"
-msgstr "old password"
-
-#: partitioncloud/templates/settings/index.html:33
-msgid "new password"
-msgstr "new password"
-
-#: partitioncloud/templates/settings/index.html:34
-msgid "confirm new password"
-msgstr "confirm new password"
-
-#: partitioncloud/templates/settings/index.html:36
-msgid "confirm"
-msgstr "confirm"
-

partitioncloud/translations/fr/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-29 12:44+0100\n"
+"POT-Creation-Date: 2024-02-25 15:18+0100\n"
 "PO-Revision-Date: 2024-01-22 15:24+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -28,91 +28,87 @@ msgstr "Utilisateur %(username)s créé"
 msgid "This album does not exists, but user %(username)s has been created"
 msgstr "Cet album n'existe pas. L'utilisateur %(username)s a été créé"
 
-#: partitioncloud/modules/albums.py:43
+#: partitioncloud/modules/albums.py:41
 msgid "Missing search query"
 msgstr "Aucun terme de recherche spécifié."
 
-#: partitioncloud/modules/albums.py:125 partitioncloud/modules/groupe.py:71
+#: partitioncloud/modules/albums.py:123 partitioncloud/modules/groupe.py:71
 #: partitioncloud/modules/groupe.py:185
 msgid "Missing name."
 msgstr "Un nom est requis."
 
-#: partitioncloud/modules/albums.py:162
+#: partitioncloud/modules/albums.py:160
 msgid "This album does not exist."
 msgstr "Cet album n'existe pas."
 
-#: partitioncloud/modules/albums.py:165
+#: partitioncloud/modules/albums.py:163
 msgid "Album added to collection."
 msgstr "Album ajouté à la collection."
 
-#: partitioncloud/modules/albums.py:179 partitioncloud/modules/albums.py:242
+#: partitioncloud/modules/albums.py:177 partitioncloud/modules/albums.py:240
-#: partitioncloud/modules/albums.py:354
+#: partitioncloud/modules/albums.py:346
 msgid "You are not a member of this album"
 msgstr "Vous ne faites pas partie de cet album"
 
-#: partitioncloud/modules/albums.py:183
+#: partitioncloud/modules/albums.py:181
 msgid "You are alone here, quitting means deleting this album."
 msgstr "Vous êtes seul dans cet album, le quitter entraînera sa suppression."
 
-#: partitioncloud/modules/albums.py:187
+#: partitioncloud/modules/albums.py:185
 msgid "Album quitted."
 msgstr "Album quitté."
 
-#: partitioncloud/modules/albums.py:206
+#: partitioncloud/modules/albums.py:204
 msgid "You are not alone in this album."
 msgstr "Vous n'êtes pas seul dans cet album."
 
-#: partitioncloud/modules/albums.py:208
+#: partitioncloud/modules/albums.py:206
 msgid "You don't own this album."
 msgstr "Vous ne possédez pas cet album."
 
-#: partitioncloud/modules/albums.py:219
+#: partitioncloud/modules/albums.py:217
 msgid "Album deleted."
 msgstr "Album supprimé."
 
-#: partitioncloud/modules/albums.py:248 partitioncloud/modules/partition.py:153
+#: partitioncloud/modules/albums.py:246 partitioncloud/modules/partition.py:153
 #: partitioncloud/modules/partition.py:199
 msgid "Missing title"
 msgstr "Un titre est requis."
 
-#: partitioncloud/modules/albums.py:250 partitioncloud/modules/partition.py:63
+#: partitioncloud/modules/albums.py:248 partitioncloud/modules/partition.py:63
 msgid "Missing file"
 msgstr "Aucun fichier n'a été fourni."
 
-#: partitioncloud/modules/albums.py:262
+#: partitioncloud/modules/albums.py:260
 msgid "Search results expired"
 msgstr "Les résultats de la recherche ont expiré."
 
-#: partitioncloud/modules/albums.py:272
+#: partitioncloud/modules/albums.py:326
-msgid "Invalid PDF file"
-msgstr "Fichier PDF invalide"
-
-#: partitioncloud/modules/albums.py:334
 #, python-format
 msgid "Score %(partition_name)s added"
 msgstr "Partition %(partition_name)s ajoutée"
 
-#: partitioncloud/modules/albums.py:348
+#: partitioncloud/modules/albums.py:340
 msgid "Selecting an album is mandatory."
 msgstr "Il est nécessaire de sélectionner un album."
 
-#: partitioncloud/modules/albums.py:350
+#: partitioncloud/modules/albums.py:342
 msgid "Selecting a score is mandatory."
 msgstr "Il est nécessaire de sélectionner une partition."
 
-#: partitioncloud/modules/albums.py:352
+#: partitioncloud/modules/albums.py:344
 msgid "Please specify a score type."
 msgstr "Il est nécessaire de spécifier un type de partition."
 
-#: partitioncloud/modules/albums.py:374
+#: partitioncloud/modules/albums.py:366
 msgid "Score added"
 msgstr "Partition ajoutée."
 
-#: partitioncloud/modules/albums.py:376
+#: partitioncloud/modules/albums.py:368
 msgid "Score is already in the album."
 msgstr "Partition déjà dans l'album."
 
-#: partitioncloud/modules/albums.py:388
+#: partitioncloud/modules/albums.py:380
 msgid "Unknown score type."
 msgstr "Type de partition inconnu."
 
@@ -120,8 +116,8 @@ msgstr "Type de partition inconnu."
 msgid "You need to login to access this resource."
 msgstr "Vous devez être connecté pour accéder à cette page."
 
-#: partitioncloud/modules/auth.py:59 partitioncloud/modules/settings.py:50
+#: partitioncloud/modules/auth.py:59 partitioncloud/modules/settings.py:46
-#: partitioncloud/modules/settings.py:82
+#: partitioncloud/modules/settings.py:69
 msgid "Missing rights."
 msgstr "Droits insuffisants."
 
@@ -129,7 +125,7 @@ msgstr "Droits insuffisants."
 msgid "Missing username."
 msgstr "Un nom d'utilisateur est requis."
 
-#: partitioncloud/modules/auth.py:87 partitioncloud/modules/settings.py:96
+#: partitioncloud/modules/auth.py:87 partitioncloud/modules/settings.py:81
 msgid "Missing password."
 msgstr "Un mot de passe est requis."
 
@@ -224,31 +220,27 @@ msgstr "Vous n'êtes pas autorisé à supprimer cette partition."
 msgid "Score deleted."
 msgstr "Partition supprimée."
 
-#: partitioncloud/modules/settings.py:40 partitioncloud/modules/settings.py:72
+#: partitioncloud/modules/settings.py:37 partitioncloud/modules/settings.py:60
 msgid "Missing user id."
 msgstr "Identifiant d'utilisateur manquant."
 
-#: partitioncloud/modules/settings.py:54
+#: partitioncloud/modules/settings.py:50
-msgid "You are not allowed to delete your account."
-msgstr "Vous n'êtes pas autorisé à supprimer votre compte."
-
-#: partitioncloud/modules/settings.py:60
 msgid "User successfully deleted."
 msgstr "Utilisateur supprimée."
 
-#: partitioncloud/modules/settings.py:86
+#: partitioncloud/modules/settings.py:73
 msgid "Missing old password."
 msgstr "Ancien mot de passe manquant."
 
-#: partitioncloud/modules/settings.py:90
+#: partitioncloud/modules/settings.py:77
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect."
 
-#: partitioncloud/modules/settings.py:100
+#: partitioncloud/modules/settings.py:85
 msgid "Password and its confirmation differ."
 msgstr "Le mot de passe et sa confirmation diffèrent"
 
-#: partitioncloud/modules/settings.py:104
+#: partitioncloud/modules/settings.py:89
 msgid "Successfully updated password."
 msgstr "Mot de passe mis à jour."
 
@@ -418,7 +410,6 @@ msgstr "Êtes vous sûr de vouloir supprimer cet album ?"
 #: partitioncloud/templates/partition/delete.html:10
 #: partitioncloud/templates/partition/details.html:86
 #: partitioncloud/templates/partition/edit.html:57
-#: partitioncloud/templates/settings/index.html:19
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -664,47 +655,3 @@ msgstr "Modifier \"%(name)s\""
 msgid "Source"
 msgstr "Source"
 
-#: partitioncloud/templates/settings/index.html:3
-msgid "Settings"
-msgstr "Paramètres"
-
-#: partitioncloud/templates/settings/index.html:8
-#: partitioncloud/templates/settings/index.html:39
-#: partitioncloud/templates/settings/index.html:40
-msgid "Delete account"
-msgstr "Supprimer le compte"
-
-#: partitioncloud/templates/settings/index.html:15
-#, python-format
-msgid ""
-"Do you really want to delete %(username)s's account ? This action is "
-"%(irreversible_bold)s."
-msgstr ""
-"Souhaitez-vous vraiment supprimer le compte de %(username)s ? Cette "
-"action est %(irreversible_bold)s."
-
-#: partitioncloud/templates/settings/index.html:27
-#, python-format
-msgid "User %(username)s has %(album_count)s albums"
-msgstr "L'utilisateur %(username)s a %(album_count)s albums"
-
-#: partitioncloud/templates/settings/index.html:29
-msgid "Change password"
-msgstr "Changer de mot de passe"
-
-#: partitioncloud/templates/settings/index.html:31
-msgid "old password"
-msgstr "ancien mot de passe"
-
-#: partitioncloud/templates/settings/index.html:33
-msgid "new password"
-msgstr "nouveau mot de passe"
-
-#: partitioncloud/templates/settings/index.html:34
-msgid "confirm new password"
-msgstr "confirmer le nouveau mot de passe"
-
-#: partitioncloud/templates/settings/index.html:36
-msgid "confirm"
-msgstr "confirmer"
-