Project

General

Profile

« Previous | Next » 

Revision 57618

[Monitor Dashboard]: Fix validation of names in dropdown edit. Move getFullUrl on inidicator Utils

View differences:

monitor.component.ts
15 15
import {StatisticsService} from "../utils/services/statistics.service";
16 16
import {Item, Sidebar} from "../utils/entities/sidebar";
17 17
import {SideBarService} from "../library/sharedComponents/sidebar/sideBar.service";
18
import {IndicatorUtils} from "../utils/indicator-utils";
18 19

  
19 20
@Component({
20 21
  selector: 'monitor',
......
26 27
  public divContents = null;
27 28
  public status: number;
28 29
  public loading: boolean = true;
30
  public indicatorUtils: IndicatorUtils = new IndicatorUtils();
29 31
  public activeTopic: Topic = null;
30 32
  public activeCategory: Category = null;
31 33
  public activeSubCategory: SubCategory = null;
......
221 223
  }
222 224

  
223 225
  public getUrlByStakeHolder(indicatorPath: IndicatorPath) {
224
    return this.sanitizer.bypassSecurityTrustResourceUrl(this.statisticsService.getChartUrl(indicatorPath.source, indicatorPath.getFullUrl()));
226
    return this.sanitizer.bypassSecurityTrustResourceUrl(
227
      this.statisticsService.getChartUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(indicatorPath)));
225 228
  }
226 229

  
227 230
  public setActiveChart(index, type: string) {

Also available in: Unified diff