Rename featureReportService to documentServiceUrl

qgis · Oct 24, 2024 · bb6f31c · bb6f31c
1 parent f2e2b80
commit bb6f31c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/components/IdentifyViewer.jsx b/components/IdentifyViewer.jsx
@@ -382,7  382,7 @@ class IdentifyViewer extends React.Component {
         let resultbox = null;
         let extraattribs = null;
         let featureReportTemplate = null;
-        if (ConfigUtils.getConfigProp("featureReportService")) {
         if (ConfigUtils.getConfigProp("documentServiceUrl")) {
             featureReportTemplate = result.featurereport || this.findFeatureReportTemplate(layer);
         }
         if (featureReportTemplate) {
@@ -671,7  671,7 @@ class IdentifyViewer extends React.Component {
         return reports[layer] || null;
     };
     getFeatureReportUrl = (template, result) => {
-        const serviceUrl = ConfigUtils.getConfigProp("featureReportService").replace(/\/$/, "");
         const serviceUrl = ConfigUtils.getConfigProp("documentServiceUrl").replace(/\/$/, "");
         const params = {
             feature: result.id,
             x: result.clickPos[0],
@@ -681,7  681,7 @@ class IdentifyViewer extends React.Component {
         return serviceUrl   "/"   template   "?"   Object.keys(params).map(key => encodeURIComponent(key)   "="   encodeURIComponent(params[key])).join("&");
     };
     downloadAggregatedReport = (layername, results) => {
-        const serviceUrl = ConfigUtils.getConfigProp("featureReportService").replace(/\/$/, "");
         const serviceUrl = ConfigUtils.getConfigProp("documentServiceUrl").replace(/\/$/, "");
         const params = {
             feature: results.map(result => result.id).join(","),
             x: results[0].clickPos[0],

diff --git a/package.json b/package.json
@@ -1,6  1,6 @@
 {
     "name": "qwc2",
-    "version": "2024.10.14-master",
     "version": "2024.10.24-master",
     "description": "QGIS Web Client 2 core",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

diff --git a/plugins/Reports.jsx b/plugins/Reports.jsx
@@ -227,7  227,7 @@ class Reports extends React.Component {
         });
     };
     downloadReport = () => {
-        const serviceUrl = ConfigUtils.getConfigProp("featureReportService").replace(/\/$/, "");
         const serviceUrl = ConfigUtils.getConfigProp("documentServiceUrl").replace(/\/$/, "");
         let featureIds = '';
         if (this.state.featureSelectionMode === "All") {
             featureIds = '*';