Added dimensions to save and removed elevation tab if no elevation di…

…mension for the layer
geosolutions-it · Apr 7, 2017 · 90b0f54 · 90b0f54
1 parent fd797a0
commit 90b0f54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/web/client/components/TOC/fragments/SettingsModal.jsx b/web/client/components/TOC/fragments/SettingsModal.jsx
@@ -146,12 +146,11 @@ const SettingsModal = React.createClass({
         const display = this.renderDisplay();
         const style = this.renderStyleTab();
         const elevation = this.renderElevationTab();
-        const tabs = (<Tabs defaultActiveKey={1} id="layerProperties-tabs">
-            <Tab eventKey={1} title={<Message msgId="layerProperties.general" />}>{general}</Tab>
-            <Tab eventKey={2} title={<Message msgId="layerProperties.display" />}>{display}</Tab>
-            <Tab eventKey={3} title={<Message msgId="layerProperties.style" />} disabled={!style} >{style}</Tab>
-            <Tab eventKey={4} title={<Message msgId="layerProperties.elevation" />} disabled={!elevation} >{elevation}</Tab>
-          </Tabs>);
+        const availableTabs = [<Tab eventKey={1} title={<Message msgId="layerProperties.general" />}>{general}</Tab>,
+                <Tab eventKey={2} title={<Message msgId="layerProperties.display" />}>{display}</Tab>,
+                <Tab eventKey={3} title={<Message msgId="layerProperties.style" />} disabled={!style} >{style}</Tab>]
+            .concat(elevation ? [<Tab eventKey={4} title={<Message msgId="layerProperties.elevation" />}>{elevation}</Tab>] : []);
+        const tabs = <Tabs defaultActiveKey={1} id="layerProperties-tabs">{availableTabs}</Tabs>;
         const footer = (<span role="footer">
             {this.props.includeCloseButton ? <Button bsSize={this.props.buttonSize} onClick={this.onClose}>{this.props.closeText}</Button> : <span/>}
             {this.props.includeDeleteButton ?

diff --git a/web/client/utils/LayersUtils.js b/web/client/utils/LayersUtils.js
@@ -201,6 +201,7 @@ var LayersUtils = {
             allowedSRS: layer.allowedSRS,
             matrixIds: layer.matrixIds,
             tileMatrixSet: layer.tileMatrixSet,
+            dimensions: layer.dimensions || [],
             ...assign({}, layer.params ? {params: layer.params} : {})
         };
     }