Skip to content

Commit

Permalink
fix geosolutions-it#572. Toolbar uses cfg from localconfig (geosoluti…
Browse files Browse the repository at this point in the history
  • Loading branch information
offtherailz committed May 18, 2016
1 parent 041f7a6 commit dae781c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions web/client/plugins/Toolbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const Toolbar = React.createClass({
getPanels() {
return this.getTools()
.filter((tool) => tool.panel)
.map((tool) => ({name: tool.name, title: tool.title, panel: this.getPanel(tool), items: tool.items, wrap: tool.wrap || false}));
.map((tool) => ({name: tool.name, title: tool.title, cfg: tool.cfg, panel: this.getPanel(tool), items: tool.items, wrap: tool.wrap || false}));
},
getAllTools() {
const unsorted = [...tools, ...this.props.items].map((item, index) => assign({}, item, {position: item.position || index}));
Expand Down Expand Up @@ -116,7 +116,7 @@ const Toolbar = React.createClass({
return this.getPanels().map((panel) => {
const ToolPanelComponent = panel.panel;
const ToolPanel = (<ToolPanelComponent
key={panel.name} mapType={this.props.mapType} {...(panel.props || {})}
key={panel.name} mapType={this.props.mapType} {...panel.cfg} {...(panel.props || {})}
items={panel.items || []}/>);
const title = panel.title ? <Message msgId={panel.title}/> : null;
if (panel.wrap) {
Expand Down

0 comments on commit dae781c

Please sign in to comment.