Merge branch 'beta' into 'main'

revert sort tables to member views

See merge request bde/nk20!262

apps/activity/admin.py

@@ -5,7 +5,7 @@ from django.contrib import admin
 from note_kfet.admin import admin_site
 
 from .forms import GuestForm
-from .models import Activity, ActivityType, Entry, Guest
+from .models import Activity, ActivityType, Entry, Guest, Opener
 
 
 @admin.register(Activity, site=admin_site)
@@ -45,3 +45,11 @@ class EntryAdmin(admin.ModelAdmin):
     Admin customisation for Entry
     """
     list_display = ('note', 'activity', 'time', 'guest')
+
+
+@admin.register(Opener, site=admin_site)
+class OpenerAdmin(admin.ModelAdmin):
+    """
+    Admin customisation for Opener
+    """
+    list_display = ('activity', 'opener')

apps/activity/static/activity/js/opener.js

@@ -1,5 +1,5 @@
 /**
- * On form submit, create a new friendship
+ * On form submit, add a new opener
  */
 function form_create_opener (e) {
   // Do not submit HTML form
@@ -16,9 +16,9 @@ function form_create_opener (e) {
 }
 
 /**
- * Create a trust between users
+ * Add an opener between an activity and a user
- * @param trusting:Integer trusting note id
+ * @param activity:Integer activity id
- * @param trusted:Integer trusted note id
+ * @param opener:Integer user note id
  */
 function create_opener(activity, opener) {
   $.post('/api/activity/opener/', {
@@ -28,36 +28,15 @@ function create_opener(activity, opener) {
   }).done(function () {
   // Reload tables
   $('#opener_table').load(location.pathname + ' #opener_table')
-    addMsg(gettext('Friendship successfully added'), 'success')
+    addMsg(gettext('Opener successfully added'), 'success')
   }).fail(function (xhr, _textStatus, _error) {
     errMsg(xhr.responseJSON)
   })
 }
 
 /**
- * On form submit, create a new friendship
+ * On click of "delete", delete the opener
-function create_opener (e) {
+ * @param button_id:Integer Opener id to remove
-  // Do not submit HTML form
-  e.preventDefault()
-
-  // Get data and send to API
-  const formData = new FormData(e.target)
-  $.post('/api/activity/opener/', {
-    csrfmiddlewaretoken: formData.get('csrfmiddlewaretoken'),
-    activity: formData.get('activity'),
-    opener: formData.get('opener')
-  }).done(function () {
-    // Reload table
-    $('#opener_table').load(location.pathname + ' #opener_table')
-    addMsg(gettext('Alias successfully added'), 'success')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}*/
-
-/**
- * On click of "delete", delete the trust
- * @param button_id:Integer Trust id to remove
  */
 function delete_button (button_id) {
   $.ajax({
@@ -65,7 +44,7 @@ function delete_button (button_id) {
     method: 'DELETE',
     headers: { 'X-CSRFTOKEN': CSRF_TOKEN }
   }).done(function () {
-    addMsg(gettext('Friendship successfully deleted'), 'success')
+    addMsg(gettext('Opener successfully deleted'), 'success')
     $('#opener_table').load(location.pathname + ' #opener_table')
   }).fail(function (xhr, _textStatus, _error) {
     errMsg(xhr.responseJSON)

apps/member/views.py

@@ -166,8 +166,7 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         # Display only the most recent membership
         club_list = club_list.distinct("club__name")\
             if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else club_list
-        club_list_order_by = self.request.GET.getlist("membership-sort", ("club__name", "-date_start"))
+        membership_table = MembershipTable(data=club_list, prefix='membership-')
-        membership_table = MembershipTable(data=club_list, prefix='membership-', order_by=club_list_order_by)
         membership_table.paginate(per_page=10, page=self.request.GET.get("membership-page", 1))
         context['club_list'] = membership_table
 
@@ -477,8 +476,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         managers = Membership.objects.filter(club=self.object, roles__name="Bureau de club",
                                              date_start__lte=date.today(), date_end__gte=date.today())\
             .order_by('user__last_name').all()
-        managers_order_by = self.request.GET.getlist("managers-sort", ('user__last_name'))
+        context["managers"] = ClubManagerTable(data=managers, prefix="managers-")
-        context["managers"] = ClubManagerTable(data=managers, prefix="managers-", order_by=managers_order_by)
         # transaction history
         club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\
             .filter(PermissionBackend.filter_queryset(self.request, Transaction, "view"))\
@@ -496,8 +494,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         club_member = club_member.distinct("user__username")\
             if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else club_member
 
-        membership_order_by = self.request.GET.getlist("membership-sort", ("user__username", "-date_start"))
+        membership_table = MembershipTable(data=club_member, prefix="membership-")
-        membership_table = MembershipTable(data=club_member, prefix="membership-", order_by=membership_order_by)
         membership_table.paginate(per_page=5, page=self.request.GET.get('membership-page', 1))
         context['member_list'] = membership_table
 

apps/permission/fixtures/initial.json

@@ -3167,12 +3167,12 @@
 				"activity",
 				"entry"
 			],
-			"query": "{\"activity__opener__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]], \"activity__open\": true, \"activity__activity_type__manage_entries\":true}",
+			"query": "{\"activity__opener__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]]}",
 			"type": "view",
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Voir les entrées des activités ouvertes dont l'utilisateur⋅rice est ouvreur⋅se"
+			"description": "Voir les entrées des activités dont l'utilisateur⋅rice est ouvreur⋅se"
 		}
 	},
 	{
@@ -3183,12 +3183,12 @@
 				"activity",
 				"guest"
 			],
-			"query": "{\"activity__pk__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]], \"activity__open\": true, \"activity__activity_type__manage_entries\":true}",
+			"query": "{\"activity__opener__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]]}",
 			"type": "view",
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Voir les invité⋅es des activités ouvertes dont l'utilisateur⋅rice est ouvreur⋅se"
+			"description": "Voir les invité⋅es des activités dont l'utilisateur⋅rice est ouvreur⋅se"
 		}
 	},
 	{

apps/treasury/templates/treasury/invoice_sample.tex

@@ -109,7 +109,7 @@
 \renewcommand{\headrulewidth}{0pt}
 \cfoot{
     \small{\MonNom  ~--~ \MonAdresseRue ~ \MonAdresseVille ~--~ Téléphone : +33(0)7 78 17 22 34\newline
-     Site web : bde.ens-cachan.fr ~--~ E-mail : tresorerie.bde@lists.crans.org \newline Numéro SIRET : 399 485 838 00029
+     E-mail : tresorerie.bde@lists.crans.org ~--~ Numéro SIRET : 399 485 838 00029
     }
 }
 

docs/faq.rst

@@ -177,11 +177,13 @@ Contributeur⋅rices
 
    Liste des contributeur⋅rices majeur⋅es, par ordre alphabétique :
 
-   * Pierre-André « PAC » COMBY
+   * bleizi
-   * Emmy « ÿnérant » D'ANELLO
+   * erdnaxe
-   * Benjamin « esum » GRAILLOT
+   * esum
-   * Alexandre « erdnaxe » IOOSS
+   * korenst1
-   * Nicolas « nicomarg » MARGULIES
+   * nicomarg
+   * PAC
+   * ÿnérant
 
 
 Hébergement

locale/fr/LC_MESSAGES/djangojs.po

@@ -17,6 +17,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: apps/member/static/member/js/alias.js:17
+msgid "Opener successfully added"
+msgstr "Ouvreureuse ajouté avec succès"
+
+#: apps/member/static/member/js/alias.js:17
+msgid "Opener successfully deleted"
+msgstr "Ouvreureuse supprimé avec succès"
+
 #: apps/member/static/member/js/alias.js:17
 msgid "Alias successfully added"
 msgstr "Alias ajouté avec succès"