diff options
| author |   tang peng <tang.peng5@zte.com.cn> | 2018-07-30 23:57:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-30 23:57:59 +0000 |
| commit | da9261d9d5ed404ed030918238feaab0dd54fcc1 (patch) | |
| tree | 5607167377b6f2269f581cb3fcc45a627d2bd38e | |
| parent | 18152dddbb79a461064561b00c71d6fe01f00972 (diff) | |
| parent | 9c89d648ca92eccc3a1d6d867eb6188c725f698e (diff) | |
Merge "Fixed some field names"
| -rw-r--r-- | rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts | 4 | ||||
| -rw-r--r-- | rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts index 6273e9a..6a3ea0a 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts @@ -39,7 +39,7 @@ export class AlarmRule implements OnInit { model: any; ruleRequest: RuleRequest; solution = 'ANGULAR'; - selection = 'A' + selection = 'A'; activeStatus = ["option_all", "common_enabled", "common_disabled"]; constructor(public _alarmRuleService: AlarmRuleService, private modalService: ModalService, @@ -76,7 +76,7 @@ export class AlarmRule implements OnInit { return this._alarmRuleService .getRules() .then(rules => { - this.rules = rules.rules; + this.rules = rules.correlationRules; this.totalcount = rules.totalcount; }); } diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts index d558041..b410d6d 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts @@ -69,7 +69,7 @@ export class AlarmRuleService { const url = `${this.ruleUrl}?queryrequest=${JSON.stringify(data)}` return this.http.get(url, { body: data, headers: this.headers }) .toPromise() - .then(res => res.json().rules as RuleModel[]) + .then(res => res.json().correlatoinRules as RuleModel[]) .catch(this.handleError); } @@ -88,7 +88,8 @@ export class AlarmRuleService { "ruleId": rule.ruleId, "description": rule.description, "content": rule.content, - "enabled": rule.enabled + "enabled": rule.enabled, + "loopControlName": rule.loopControlName } const url = `${this.ruleUrl}` return this.http @@ -103,7 +104,8 @@ export class AlarmRuleService { "description": rule.description, "content": rule.content, "enabled": rule.enabled, - "ruleName": rule.ruleName + "ruleName": rule.ruleName, + "loopControlName": rule.loopControlName } return this.http.put(this.ruleUrl, JSON.stringify(ruledata), { headers: this.headers }) .toPromise() |