store dav prefix in lizUrls object for client side utilization

3liz · Nov 22, 2023 · 857c4f4 · 857c4f4
1 parent f5f6294
commit 857c4f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/assets/src/legacy/attributeTable.js b/assets/src/legacy/attributeTable.js
@@ -1510,15 +1510,15 @@ var lizAttributeTable = function() {
                         }
                     } else {
                         // Check if we need to replace url or media by link
-                        let davConf = lizUrls['webDavUrl'] && config.layers[aName]?.webDavFields && Array.isArray(config.layers[aName].webDavFields) && config.layers[aName].webDavFields.includes(columnName) || false;
+                        let davConf = lizUrls.webDavUrl && lizUrls?.resourceUrlReplacement?.webdav && config.layers[aName]?.webDavFields && Array.isArray(config.layers[aName].webDavFields) && config.layers[aName].webDavFields.includes(columnName);
                         colConf['render'] = function (data, type, row, meta) {
                             // Replace media and URL with links
                             if (!data || !(typeof data === 'string'))
                                 return data;
                             if (davConf) {
                                 // replace the root of the url
-                                if(data.startsWith(lizUrls['webDavUrl'])){
-                                    data = data.replace(lizUrls['webDavUrl'],'dav/')
+                                if(data.startsWith(lizUrls.webDavUrl)){
+                                    data = data.replace(lizUrls.webDavUrl, lizUrls.resourceUrlReplacement.webdav)
                                 }
                             }
 
@@ -1529,7 +1529,7 @@ var lizAttributeTable = function() {
                                     rdata = data.slice(1);
                                 return '<a href="' + mediaLinkPrefix + '&path=' + rdata + '" target="_blank">' + colMeta.title + '</a>';
                             }
-                            else if (data.substring(0, 4) == 'dav/') {
+                            else if (davConf && data.substring(0, 4) == lizUrls.resourceUrlReplacement.webdav) {
                                     var rdata = data;
                                     var colMeta = meta.settings.aoColumns[meta.col];
                                     return '<a href="' + mediaLinkPrefix + '&path=' + rdata + '" target="_blank">' + colMeta.title + '</a>';

diff --git a/lizmap/modules/view/controllers/lizMap.classic.php b/lizmap/modules/view/controllers/lizMap.classic.php
@@ -205,6 +205,7 @@ public function index()
             'basepath' => $bp,
             'geobookmark' => jUrl::get('lizmap~geobookmark:index'),
             'service' => jUrl::get('lizmap~service:index').'?repository='.$repository.'&project='.$project,
+            'resourceUrlReplacement' => array(),
         );
 
         // Get optional WMS public url list
@@ -226,6 +227,7 @@ function f($x)
         $webDavProfile = RemoteStorageRequest::getProfile('webdav');
         if ($webDavProfile) {
             $lizUrls['webDavUrl'] = $webDavProfile['baseUri'];
+            $lizUrls['resourceUrlReplacement']['webdav'] = 'dav/';
         }
 
         $rep->addJSCode('var lizUrls = '.json_encode($lizUrls).';');