fix: use new swagger lib for advanced search & remove jquery duplicates

Signed-off-by: WoodenMaiden <yann.pomie@laposte.net>
SouthGreenPlatform · Sep 23, 2024 · 05a0f59 · 05a0f59
1 parent 1c673d3
commit 05a0f59
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/agrold-javaweb/src/main/webapp/WEB-INF/jspf/advancedModal.jsp b/agrold-javaweb/src/main/webapp/WEB-INF/jspf/advancedModal.jsp
@@ -33,6 +33,8 @@
     </div>
 </div>
 <script>
+    $.noConflict(); // TODO: JQuery is used twice or more, leading to conflicts
+                    // Remove this line when the issue is fixed
     /***************************************************************/
     /*********************  Specific modal code ********************/
     /***************************************************************/
@@ -79,13 +81,12 @@
         $('.modal-result').html(ModalContext.ACTIVE.html);
         //graphicalInitialisation();
         window.swagger = new SwaggerClient({
-            url: url,
-            success: function () {
-                console.log("# -- Call swagger for MODAL");
-                ModalContext.ACTIVE.getDescription(ModalContext.uri);
-            }
+            url
+        }).then(client => {
+            console.log("# -- Call swagger for MODAL");
+            ModalContext.ACTIVE.getDescription(ModalContext.uri);
+            console.log('#### --- ## --- ####')
         });
-        console.log('#### --- ## --- ####')
     }
     function JSON_DEBUG(json) {
         for (var i in json) {

diff --git a/agrold-javaweb/src/main/webapp/includes.jsp b/agrold-javaweb/src/main/webapp/includes.jsp
@@ -24,7 +24,7 @@
 <!--link href="styles/menu1.css" rel="stylesheet" type="text/css"/-->
 <link rel="stylesheet" type="text/css" href="styles/bootstrap/css/bootstrap-grid.min.css">
 <link rel="stylesheet" type="text/css" href="styles/font-awesome/css/font-awesome.min.css">
-<script type="text/javascript" src="styles/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="styles/bootstrap/js/bootstrap.js"></script>
 <link rel="stylesheet" type="text/css" href="styles/bootstrap/css/bootstrap.css">
 
 <jsp:include page="injectProperties.jsp"></jsp:include>