Merge branch 'beta' into 'main'

api errors (fix #113), sortable tables, calendar (fix #95), opener (fix #117), colored linters, inclusif, bug july 31, 403 (fix #65)

See merge request bde/nk20!260

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

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

docs/faq.rst

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