mpana
/
sc-portal
1
0
Fork 0
Code Issues 15 Pull Requests Projects Releases Wiki Activity

TRIX-32 fix afinity issue

This commit is contained in:
Dragos 2021-06-07 12:08:57 +03:00
parent ec15cc7c9d
commit 4bb56cf410
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.ts
View File

@ -70,15 +70,15 @@ export class AffinityRuleEditorComponent implements OnInit, OnDestroy
let rule: string; let rule: string;
if (this.editorForm.get('target').value === 'machine') if (this.editorForm.get('target').value === 'instance')
rule = `machine${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`; rule = `instance${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`;
else else
rule = `${this.editorForm.get('tagName').value}${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`; rule = `${this.editorForm.get('tagName').value}${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`;
this.saved.emit({ this.saved.emit({
strict: this.editorForm.get('strict').value === '=', strict: this.editorForm.get('strict').value === '=',
closeTo: this.editorForm.get('operator').value === '=', closeTo: this.editorForm.get('operator').value === '=',
targetMachine: this.editorForm.get('target').value === 'machine', targetMachine: this.editorForm.get('target').value === 'instance',
tagName: this.editorForm.get('tagName').value, tagName: this.editorForm.get('tagName').value,
value: this.editorForm.get('value').value, value: this.editorForm.get('value').value,
rule rule

2
app/src/app/machines/machine-wizard/machine-wizard.component.html
View File

@ -238,7 +238,7 @@
<div class="row mb-3 gx-3"> <div class="row mb-3 gx-3">
<div class="col-sm-6"> <div class="col-sm-6">
<h5 class="text-truncate"><b>Tags</b> make it easier to lookup an machine</h5> <h5 class="text-truncate"><b>Tags</b> make it easier to lookup a machine</h5>
<div class="row"> <div class="row">
<div class="col-sm"> <div class="col-sm">
<div class="select-list list-group select-list p-0 mb-2 py-2" tabindex="0"> <div class="select-list list-group select-list p-0 mb-2 py-2" tabindex="0">

2
app/src/assets/i18n/machines/en.json
View File

@ -209,7 +209,7 @@
"volumeReadOnly": "Read only", "volumeReadOnly": "Read only",
"volumesDisabled": "Volumes are disabled for KVM packages", "volumesDisabled": "Volumes are disabled for KVM packages",
"noVolumes": "You don't have any volumes defined", "noVolumes": "You don't have any volumes defined",
"tagsHint": "<b>Tags</b> make it easier to lookup an machine", "tagsHint": "<b>Tags</b> make it easier to lookup a machine",
"addTag": "Add a new tag", "addTag": "Add a new tag",
"removeTag": "Remove this tag", "removeTag": "Remove this tag",
"metadataHint": "<b>Metadata</b> makes it easier to find a machine", "metadataHint": "<b>Metadata</b> makes it easier to find a machine",