Commit a083719de40e63eeab734253312ad0a29b0e021a
1 parent
6ce3a757
Rename edge Default rule chain to Auto-assign
Showing
6 changed files
with
28 additions
and
28 deletions
... | ... | @@ -1587,7 +1587,7 @@ |
1587 | 1587 | "assign-rulechains": "Assign rulechains", |
1588 | 1588 | "assign-new-rulechain": "Assign new rulechain", |
1589 | 1589 | "delete-rulechains": "Delete rulechains", |
1590 | - "default": "Default", | |
1590 | + "auto-assign-to-edge": "Auto-assign to edge(s)", | |
1591 | 1591 | "unassign-rulechain": "Unassign rulechain", |
1592 | 1592 | "unassign-rulechains": "Unassign rulechains", |
1593 | 1593 | "unassign-rulechain-title": "Are you sure you want to unassign the rulechain '{{ruleChainTitle}}'?", |
... | ... | @@ -1601,12 +1601,12 @@ |
1601 | 1601 | "set-default-root-edge-rulechain-title": "Are you sure you want to make the rule chain '{{ruleChainName}}' default edge root?", |
1602 | 1602 | "set-default-root-edge-rulechain-text": "After the confirmation the rule chain will become default edge root and will handle all incoming transport messages.", |
1603 | 1603 | "invalid-rulechain-type-error": "Unable to import rule chain: Invalid rule chain type. Expected type is {{expectedRuleChainType}}.", |
1604 | - "set-default-edge": "Make rule chain default", | |
1605 | - "set-default-edge-title": "Are you sure you want to make the edge rule chain '{{ruleChainName}}' default?", | |
1606 | - "set-default-edge-text": "After the confirmation the edge rule chain will be added to default list and assigned to newly created edge(s).", | |
1607 | - "remove-default-edge": "Remove rule chain from defaults", | |
1608 | - "remove-default-edge-title": "Are you sure you want to remove the edge rule chain '{{ruleChainName}}' from default list?", | |
1609 | - "remove-default-edge-text": "After the confirmation the edge rule chain will not be assigned for a newly created edges." | |
1604 | + "set-auto-assign-to-edge": "Auto-assign rule chain to edge(s) on creation", | |
1605 | + "set-auto-assign-to-edge-title": "Are you sure you want to auto-assign the edge rule chain '{{ruleChainName}}' to edge(s) on creation?", | |
1606 | + "set-auto-assign-to-edge-text": "After the confirmation the edge rule chain will be automatically assigned to edge(s) on creation.", | |
1607 | + "remove-auto-assign-to-edge": "Do not assign rule chain to edge(s) on creation", | |
1608 | + "remove-auto-assign-to-edge-title": "Are you sure you do not want to auto-assign the edge rule chain '{{ruleChainName}}' to edge(s) on creation?", | |
1609 | + "remove-auto-assign-to-edge-text": "After the confirmation the edge rule chain won't be automatically assigned to edge(s) on creation." | |
1610 | 1610 | }, |
1611 | 1611 | "rulenode": { |
1612 | 1612 | "details": "Details", | ... | ... |
... | ... | @@ -20,4 +20,4 @@ |
20 | 20 | |
21 | 21 | <div ng-if="vm.parentCtl.ruleChainsScope === 'edges' && vm.parentCtl.isRootRuleChain(item)" translate>rulechain.default-root</div> |
22 | 22 | |
23 | -<div ng-if="(vm.parentCtl.ruleChainsScope === 'edges' && vm.parentCtl.isDefaultEdgeRuleChain(item))" translate>rulechain.default</div> | |
23 | +<div ng-if="(vm.parentCtl.ruleChainsScope === 'edges' && vm.parentCtl.isDefaultEdgeRuleChain(item))" translate>rulechain.auto-assign-to-edge</div> | ... | ... |
... | ... | @@ -26,12 +26,12 @@ |
26 | 26 | <md-button ng-click="onSetRootRuleChain({event: $event})" |
27 | 27 | ng-show="!isEdit && !ruleChain.root && ruleChainsScope == 'edges'" |
28 | 28 | class="md-raised md-primary">{{ 'rulechain.set-default-root-edge' | translate }}</md-button> |
29 | -<md-button ng-click="onSetDefaultEdgeRuleChain({event: $event})" | |
29 | +<md-button ng-click="onSetAutoAssignToEdgeRuleChain({event: $event})" | |
30 | 30 | ng-show="!isEdit && !ruleChain.root && !ruleChain.isDefault && ruleChainsScope == 'edges'" |
31 | - class="md-raised md-primary">{{ 'rulechain.set-default-edge' | translate }}</md-button> | |
31 | + class="md-raised md-primary">{{ 'rulechain.set-auto-assign-to-edge' | translate }}</md-button> | |
32 | 32 | <md-button ng-click="onRemoveDefaultEdgeRuleChain({event: $event})" |
33 | 33 | ng-show="!isEdit && !ruleChain.root && ruleChain.isDefault && ruleChainsScope == 'edges'" |
34 | - class="md-raised md-primary">{{ 'rulechain.remove-default-edge' | translate }}</md-button> | |
34 | + class="md-raised md-primary">{{ 'rulechain.remove-auto-assign-to-edge' | translate }}</md-button> | |
35 | 35 | |
36 | 36 | <md-button ng-click="onSetRootRuleChain({event: $event})" |
37 | 37 | ng-show="!isEdit && ruleChainsScope == 'edge' && edge.rootRuleChainId.id !== ruleChain.id.id" | ... | ... |
... | ... | @@ -42,8 +42,8 @@ export default function RuleChainDirective($compile, $templateCache, $mdDialog, |
42 | 42 | theForm: '=', |
43 | 43 | ruleChainsScope: '=', |
44 | 44 | edge: '=', |
45 | - onSetDefaultEdgeRuleChain: '&', | |
46 | - onRemoveDefaultEdgeRuleChain: '&', | |
45 | + onSetAutoAssignToEdgeRuleChain: '&', | |
46 | + onRemoveAutoAssignToEdgeRuleChain: '&', | |
47 | 47 | onSetRootRuleChain: '&', |
48 | 48 | onExportRuleChain: '&', |
49 | 49 | onDeleteRuleChain: '&' | ... | ... |
... | ... | @@ -97,7 +97,7 @@ export default function RuleChainsController(ruleChainService, userService, impo |
97 | 97 | |
98 | 98 | vm.exportRuleChain = exportRuleChain; |
99 | 99 | vm.setRootRuleChain = setRootRuleChain; |
100 | - vm.setDefaultEdgeRuleChain = setDefaultEdgeRuleChain; | |
100 | + vm.setAutoAssignToEdgeRuleChain = setAutoAssignToEdgeRuleChain; | |
101 | 101 | vm.removeDefaultEdgeRuleChain = removeDefaultEdgeRuleChain; |
102 | 102 | |
103 | 103 | initController(); |
... | ... | @@ -185,10 +185,10 @@ export default function RuleChainsController(ruleChainService, userService, impo |
185 | 185 | |
186 | 186 | ruleChainActionsList.push({ |
187 | 187 | onAction: function ($event, item) { |
188 | - setDefaultEdgeRuleChain($event, item); | |
188 | + setAutoAssignToEdgeRuleChain($event, item); | |
189 | 189 | }, |
190 | - name: function() { return $translate.instant('rulechain.set-default-edge') }, | |
191 | - details: function() { return $translate.instant('rulechain.set-default-edge') }, | |
190 | + name: function() { return $translate.instant('rulechain.set-auto-assign-to-edge') }, | |
191 | + details: function() { return $translate.instant('rulechain.set-auto-assign-to-edge') }, | |
192 | 192 | icon: "bookmark_outline", |
193 | 193 | isEnabled: isNonDefaultEdgeRuleChain |
194 | 194 | }); |
... | ... | @@ -197,8 +197,8 @@ export default function RuleChainsController(ruleChainService, userService, impo |
197 | 197 | onAction: function ($event, item) { |
198 | 198 | removeDefaultEdgeRuleChain($event, item); |
199 | 199 | }, |
200 | - name: function() { return $translate.instant('rulechain.remove-default-edge') }, | |
201 | - details: function() { return $translate.instant('rulechain.remove-default-edge') }, | |
200 | + name: function() { return $translate.instant('rulechain.remove-auto-assign-to-edge') }, | |
201 | + details: function() { return $translate.instant('rulechain.remove-auto-assign-to-edge') }, | |
202 | 202 | icon: "bookmark", |
203 | 203 | isEnabled: isDefaultEdgeRuleChain |
204 | 204 | }); |
... | ... | @@ -471,13 +471,13 @@ export default function RuleChainsController(ruleChainService, userService, impo |
471 | 471 | }); |
472 | 472 | } |
473 | 473 | |
474 | - function setDefaultEdgeRuleChain($event, ruleChain) { | |
474 | + function setAutoAssignToEdgeRuleChain($event, ruleChain) { | |
475 | 475 | $event.stopPropagation(); |
476 | 476 | var confirm = $mdDialog.confirm() |
477 | 477 | .targetEvent($event) |
478 | - .title($translate.instant('rulechain.set-default-edge-title', {ruleChainName: ruleChain.name})) | |
479 | - .htmlContent($translate.instant('rulechain.set-default-edge-text')) | |
480 | - .ariaLabel($translate.instant('rulechain.set-default-edge')) | |
478 | + .title($translate.instant('rulechain.set-auto-assign-to-edge-title', {ruleChainName: ruleChain.name})) | |
479 | + .htmlContent($translate.instant('rulechain.set-auto-assign-to-edge-text')) | |
480 | + .ariaLabel($translate.instant('rulechain.set-auto-assign-to-edge')) | |
481 | 481 | .cancel($translate.instant('action.no')) |
482 | 482 | .ok($translate.instant('action.yes')); |
483 | 483 | $mdDialog.show(confirm).then(function () { |
... | ... | @@ -493,9 +493,9 @@ export default function RuleChainsController(ruleChainService, userService, impo |
493 | 493 | $event.stopPropagation(); |
494 | 494 | var confirm = $mdDialog.confirm() |
495 | 495 | .targetEvent($event) |
496 | - .title($translate.instant('rulechain.remove-default-edge-title', {ruleChainName: ruleChain.name})) | |
497 | - .htmlContent($translate.instant('rulechain.remove-default-edge-text')) | |
498 | - .ariaLabel($translate.instant('rulechain.remove-default-edge')) | |
496 | + .title($translate.instant('rulechain.remove-auto-assign-to-edge-title', {ruleChainName: ruleChain.name})) | |
497 | + .htmlContent($translate.instant('rulechain.remove-auto-assign-to-edge-text')) | |
498 | + .ariaLabel($translate.instant('rulechain.remove-auto-assign-to-edge')) | |
499 | 499 | .cancel($translate.instant('action.no')) |
500 | 500 | .ok($translate.instant('action.yes')); |
501 | 501 | $mdDialog.show(confirm).then(function () { | ... | ... |
... | ... | @@ -28,8 +28,8 @@ |
28 | 28 | the-form="vm.grid.detailsForm" |
29 | 29 | rule-chains-scope="vm.ruleChainsScope" |
30 | 30 | edge="vm.edge" |
31 | - on-set-default-edge-rule-chain="vm.setDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" | |
32 | - on-remove-default-edge-rule-chain="vm.removeDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" | |
31 | + on-set-auto-assign-to-edge-rule-chain="vm.setAutoAssignToEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" | |
32 | + on-remove-auto-assign-to-edge-rule-chain="vm.removeAutoAssignToEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" | |
33 | 33 | on-set-root-rule-chain="vm.setRootRuleChain(event, vm.grid.detailsConfig.currentItem)" |
34 | 34 | on-export-rule-chain="vm.exportRuleChain(event, vm.grid.detailsConfig.currentItem)" |
35 | 35 | on-delete-rule-chain="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"> | ... | ... |