refactor: use 'url_for' in JS scripts

yaal-coop · Feb 20, 2024 · 5262229 · 5262229
1 parent acd1cee
commit 5262229
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/web/b3desk/routes.py b/web/b3desk/routes.py
@@ -486,9 +486,10 @@ def edit_meeting_files(meeting_id):
     return redirect(url_for("routes.welcome"))
 
 
+@bp.route("/meeting/files/<int:meeting_id>/")
 @bp.route("/meeting/files/<int:meeting_id>/<int:file_id>")
 @auth.oidc_auth("default")
-def download_meeting_files(meeting_id, file_id):
+def download_meeting_files(meeting_id, file_id=None):
     user = get_current_user()
     meeting = db.session.get(Meeting, meeting_id)
 

diff --git a/web/b3desk/templates/meeting/externalUpload.html b/web/b3desk/templates/meeting/externalUpload.html
@@ -10,7 +10,7 @@
     const nc_locator = "{{ user.nc_locator }}";
     const nc_login = "{{ user.nc_login }}";
     const nc_token = "{{ user.nc_token }}";
-    const meeting_id = "{{ meeting.id }}";
+    const insert_documents_url = "{{ url_for("routes.insertDocuments", meeting_id=meeting_id) }}";
 
     function createNCFilePicker() {
       let ncPickerParams = {
@@ -32,7 +32,7 @@
       var csrf_token = document.getElementsByName("csrf_token")[0].value
       var post_data = e.detail.selection.map(name => name.slice(1))
       JSON.stringify(post_data);
-      fetch('/meeting/files/'+meeting_id+'/insertDocuments', {
+      fetch(insert_documents_url, {
         method: 'POST',
         headers: {
           'Accept': 'application/json',

diff --git a/web/b3desk/templates/meeting/files.html b/web/b3desk/templates/meeting/files.html
@@ -198,7 +198,7 @@ <h1 id="delete-file-{{ file.id }}-title" class="fr-modal__title">
 								<button  data-fr-opened="false" aria-controls="delete-file-{{file.id}}"  class="fr-btn  fr-fi-delete-line" title="Supprimer"></button>
 							</td>
               <td>
-                <a href="{{ config.get("SERVER_FQDN") }}/meeting/files/{{ meeting.id }}/{{ file.id }}">
+                  <a href="{{ url_for("routes.download_meeting_files", meeting_id=meeting.id, file_id=file.id, _external=True) }}">
 									<button class="fr-btn fr-icon-download-fill" title="Télécharger"></button>
                 </a>
               </td>

diff --git a/web/b3desk/templates/meeting/js_script.html b/web/b3desk/templates/meeting/js_script.html
@@ -27,7 +27,7 @@
   let newValue = e.target.checked;
   let csrf_token = document.getElementsByName("csrf_token")[0].value;
 
-  fetch('/meeting/files/'+meeting_id+'/toggledownload', {
+  fetch(toggle_download_url, {
     method: 'POST',
     headers: {
       'Accept': 'application/json',
@@ -43,11 +43,10 @@
 }
 
 function submitDefaultFile(e){
-
   let csrf_token = document.getElementsByName("csrf_token")[0].value;
   let idFileSelected = e.target.id.split('-').slice(-1);
 
-  fetch('/meeting/files/'+meeting_id+'/default', {
+  fetch(set_default_file_url, {
     method: 'POST',
     headers: {
       'Accept': 'application/json',
@@ -72,8 +71,7 @@
 
   let csrf_token = document.getElementsByName("csrf_token")[0].value;
   let idFileSelected = e.target[0].value;
-
-  fetch('/meeting/files/delete', {
+  fetch(delete_meeting_file, {
     method: 'POST',
     headers: {
       'Accept': 'application/json',
@@ -115,7 +113,6 @@
 }
 
 function append_file_to_fileslist(title, id, date, isDefault) {
-
   var nofileavailable = document.getElementById('nofileavailable');
   if (nofileavailable) {
     nofileavailable.parentNode.removeChild(nofileavailable);
@@ -149,7 +146,7 @@
 
   buttonLink.classList.add('fr-btn','fr-icon-download-fill');
   buttonLink.setAttribute('title', 'Télécharger');
-	aLink.setAttribute('href', fqdn+'/meeting/files/'+meeting_id+'/'+id);
+	aLink.setAttribute('href', download_meeting_file_url + id);
   aLink.appendChild(buttonLink);
 	tdDownload.appendChild(aLink);
   inputIsDl.classList.add('fr-toggle__input');
@@ -235,7 +232,7 @@
   input.setAttribute('type', 'hidden');
   input.setAttribute('name', 'id');
   input.setAttribute('value', id);
-  form.setAttribute('action', '/meeting/files/delete');
+  form.setAttribute('action', delete_meeting_file);
   form.setAttribute('method', 'POST');
   form.setAttribute('onsubmit', 'deleteFile(event)');
 
@@ -261,13 +258,11 @@
 }
 
 function append_file_to_default_fileslist(title, id) {
-
   let selectDefault = document.getElementById('defaultFileSelector');
   let option = document.createElement('option');
   option.setAttribute('value', id);
   option.innerHTML = title;
   selectDefault.appendChild(option);
-
 }
 
 //
@@ -320,7 +315,7 @@
           'from': from,
   };
   JSON.stringify(post_data);
-  fetch('/meeting/files/'+meeting_id, {
+  fetch(edit_meeting_files_url, {
     method: 'POST',
     headers: {
       'Accept': 'application/json',
@@ -389,7 +384,11 @@
 const nc_login = "{{ user.nc_login }}";
 const nc_token = "{{ user.nc_token }}";
 const meeting_id = "{{ meeting.id }}";
-const fqdn = "{{ config.get("SERVER_FQDN") }}";
+const toggle_download_url = "{{ url_for("routes.toggledownload", meeting_id=meeting.id) }}";
+const set_default_file_url = "{{ url_for("routes.set_meeting_default_file", meeting_id=meeting.id) }}";
+const download_meeting_file_url = "{{ url_for("routes.download_meeting_files", meeting_id=meeting.id, _external=True) }}";
+const edit_meeting_files_url = "{{ url_for("routes.edit_meeting_files", meeting_id=meeting.id) }}";
+const delete_file_url = "{{ url_for("routes.delete_meeting_file") }}";
 let ncfilepicker = null;
 
 if (!nc_locator || !nc_login || !nc_token) {