qwc2 2026.6.9 → 2026.6.10

package/components/AttributeForm.js

@@ -377,9 +377,9 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         var changed = _this.props.editContext.changed;
         var relTable = _this.state.relationTables[table];
         var fkVal = relTable.pkField ? _this.props.editContext.feature.properties[relTable.pkField] : _this.props.editContext.feature.id;
-        var fk = _this.state.relationTables[table].fk;
-        if (_this.props.editContext.action !== "Draw" && feature.properties[fk] !== fkVal) {
-          newRelationValues[table].features[idx].properties[fk] = fkVal;
+        var fkField = _this.state.relationTables[table].fkField;
+        if (_this.props.editContext.action !== "Draw" && feature.properties[fkField] !== fkVal) {
+          newRelationValues[table].features[idx].properties[fkField] = fkVal;
           newRelationValues[table].features[idx].__status__ = "changed";
           changed = true;
         }

package/components/AttributeTableWidget.js

@@ -108,6 +108,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           type: "checkbox"
         }));
       } else if (constraints.values || constraints.keyvalrel) {
+        var _constraints$keyvalre, _constraints$keyvalre2;
         var filterExpr = null;
         if (field.filterExpression) {
           filterExpr = parseExpression(field.filterExpression, feature, editConfig, _this.props.iface, mapPrefix, _this.props.mapCrs, function () {
@@ -120,7 +121,8 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           editIface: _this.props.iface,
           fieldId: field.id,
           filterExpr: filterExpr,
-          keyvalrel: constraints.keyvalrel,
+          keyvalrel: (_constraints$keyvalre = constraints.keyvalrel) === null || _constraints$keyvalre === void 0 || (_constraints$keyvalre2 = _constraints$keyvalre.replace) === null || _constraints$keyvalre2 === void 0 ? void 0 : _constraints$keyvalre2.call(_constraints$keyvalre, new RegExp("^".concat(mapPrefix, "\\.")), ''),
+          mapPrefix: mapPrefix,
           multiSelect: constraints.allowMulti === true,
           name: field.id,
           readOnly: constraints.readOnly || disabled,

package/components/QtDesignerForm.js

@@ -539,6 +539,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
             editIface: _this.props.iface,
             fieldId: widget.name,
             key: widget.name,
+            mapPrefix: _this.props.mapPrefix,
             name: elname,
             placeholder: inputConstraints.placeholder,
             readOnly: inputConstraints.readOnly || inputConstraints.readOnly,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.06.09",
+    "version": "2026.06.10",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/Print.js

@@ -252,10 +252,15 @@ var Print = /*#__PURE__*/function (_React$Component) {
         onChange: _this.changeLayout,
         value: _this.state.layout.name
       }, _this.state.layouts.map(function (item) {
+        var name = _this.translateLayoutName(themeLayer, item);
+        if (_this.props.omitLayoutPathsFromTitle) {
+          name = name.replace(/.*\//, '');
+        }
         return /*#__PURE__*/React.createElement("option", {
           key: item.name,
+          title: name,
           value: item.name
-        }, _this.translateLayoutName(themeLayer, item));
+        }, name);
       })))), _this.props.formats.length > 1 ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         disabled: _this.state.printSeriesEnabled,
         name: "FORMAT",
@@ -1199,6 +1204,8 @@ _defineProperty(Print, "propTypes", {
   map: PropTypes.object,
   /** Whether to allow moving the extent while selecting the print series. */
   movePrintSeries: PropTypes.bool,
+  /** Whether to cut off any layout path prefixes (i.e. as in `subdir/Layout Name`) from the layout titles displayed in selection combo. */
+  omitLayoutPathsFromTitle: PropTypes.bool,
   /** Whether to print external layers. Requires QGIS Server 3.x! */
   printExternalLayers: PropTypes.bool,
   /** Whether to print highlights on the map, e.g. selected features or redlining. */

package/reducers/layers.js

@@ -282,23 +282,6 @@ export default function layers() {
             }
           });
         }
-        // Ensure (empty) theme layer is present
-        if (!_newLayers5.find(function (l) {
-          return l.role === LayerRole.THEME;
-        })) {
-          var prevThemeLayer = state.flat.find(function (l) {
-            return l.role === LayerRole.THEME;
-          });
-          if (prevThemeLayer) {
-            var themeLayer = _objectSpread(_objectSpread({}, prevThemeLayer), {}, {
-              sublayers: []
-            });
-            var pos = _newLayers5.findIndex(function (l) {
-              return l.role === LayerRole.BACKGROUND;
-            });
-            _newLayers5.splice(pos === -1 ? _newLayers5.length : pos, 0, _objectSpread(_objectSpread({}, themeLayer), LayerUtils.buildWMSLayerParams(themeLayer, state.filter)));
-          }
-        }
         UrlParams.updateParams({
           l: LayerUtils.buildWMSLayerUrlParam(_newLayers5)
         });