Merge remote-tracking branch 'origin/master' into irish-monitor-service
This commit is contained in:
commit
8d19c242e7
|
@ -505,7 +505,11 @@ public class IndicatorController {
|
||||||
if (indicatorPath.getParameters().containsKey("index_name")) {
|
if (indicatorPath.getParameters().containsKey("index_name")) {
|
||||||
indicatorPath.getParameters().put("index_name", stakeholder.getIndex_name());
|
indicatorPath.getParameters().put("index_name", stakeholder.getIndex_name());
|
||||||
} else if (indicatorPath.getParameters().containsKey("index_shortName")) {
|
} else if (indicatorPath.getParameters().containsKey("index_shortName")) {
|
||||||
indicatorPath.getParameters().put("index_shortName", stakeholder.getIndex_name().toLowerCase());
|
if(stakeholder.getIndex_shortName() != null) {
|
||||||
|
indicatorPath.getParameters().put("index_shortName", stakeholder.getIndex_shortName().toLowerCase());
|
||||||
|
} else {
|
||||||
|
indicatorPath.getParameters().remove("index_shortName");
|
||||||
|
}
|
||||||
} else if (indicatorPath.getParameters().containsKey("index_id")) {
|
} else if (indicatorPath.getParameters().containsKey("index_id")) {
|
||||||
indicatorPath.getParameters().put("index_id", stakeholder.getIndex_id());
|
indicatorPath.getParameters().put("index_id", stakeholder.getIndex_id());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue