Commit b5878fb6 authored by Emeline Mancel's avatar Emeline Mancel
Browse files

Merge branch 'jc/basex104' into 'em/basex104' 

# Conflicts:
#   ui/js/ead.js
parents e6097bd8 13e5bf7f

max.xq

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ function max:page($project, $page){ 
                (), (), (), ())



        else

        if (not(db:exists($dbPath)))

        if (not(db:exists(max.util:dbNameFromCollection($dbPath))))

            then max:max-error(

                    "Oups... La base '"|| $dbPath ||"' n'existe pas !",

                    (), (), (), ())

ui/js/ead.js

+202 −202
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class EADDocumentsBasket { 
    }



    async hydrateItems() {

        let response = await fetch(baseURI + this.project_id + "/ead/fetch_basket_data.html", {

        let response = await fetch(baseURI  + "/ead/fetch_basket_data.html", {

            method: "post",

            headers: {

                'Accept': 'application/xml',
@@ -152,7 +152,7 @@ async function initPorteDocumentsPage(project_id) { 
                	let noticeId = notice.dataset.node_id

                	docItems.push(noticeId)

                });

                window.open(baseURI + project_id + "/ead/basket.pdf?items=" + (docItems.join()), '_blank');

                window.open(baseURI + "/ead/basket.pdf?items=" + (docItems.join()), '_blank');

            });

        }