Commit 850b338943e28a361c60f754ade2a72c38dc8abc
1 parent
2c360f52
Edge's rule chains - fix for card buttons
Showing
3 changed files
with
3 additions
and
1 deletions
| @@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
| 34 | class="md-raised md-primary">{{ 'rulechain.remove-default-edge' | translate }}</md-button> | 34 | class="md-raised md-primary">{{ 'rulechain.remove-default-edge' | translate }}</md-button> |
| 35 | 35 | ||
| 36 | <md-button ng-click="onSetRootRuleChain({event: $event})" | 36 | <md-button ng-click="onSetRootRuleChain({event: $event})" |
| 37 | - ng-show="!isEdit && ruleChainsScope == 'edge'" | 37 | + ng-show="!isEdit && ruleChainsScope == 'edge' && edge.rootRuleChainId.id !== ruleChain.id.id" |
| 38 | class="md-raised md-primary">{{ 'rulechain.set-root' | translate }}</md-button> | 38 | class="md-raised md-primary">{{ 'rulechain.set-root' | translate }}</md-button> |
| 39 | 39 | ||
| 40 | <md-button ng-click="onDeleteRuleChain({event: $event})" | 40 | <md-button ng-click="onDeleteRuleChain({event: $event})" |
| @@ -41,6 +41,7 @@ export default function RuleChainDirective($compile, $templateCache, $mdDialog, | @@ -41,6 +41,7 @@ export default function RuleChainDirective($compile, $templateCache, $mdDialog, | ||
| 41 | isReadOnly: '=', | 41 | isReadOnly: '=', |
| 42 | theForm: '=', | 42 | theForm: '=', |
| 43 | ruleChainsScope: '=', | 43 | ruleChainsScope: '=', |
| 44 | + edge: '=', | ||
| 44 | onSetDefaultEdgeRuleChain: '&', | 45 | onSetDefaultEdgeRuleChain: '&', |
| 45 | onRemoveDefaultEdgeRuleChain: '&', | 46 | onRemoveDefaultEdgeRuleChain: '&', |
| 46 | onSetRootRuleChain: '&', | 47 | onSetRootRuleChain: '&', |
| @@ -27,6 +27,7 @@ | @@ -27,6 +27,7 @@ | ||
| 27 | is-read-only="vm.grid.isDetailsReadOnly(vm.grid.operatingItem())" | 27 | is-read-only="vm.grid.isDetailsReadOnly(vm.grid.operatingItem())" |
| 28 | the-form="vm.grid.detailsForm" | 28 | the-form="vm.grid.detailsForm" |
| 29 | rule-chains-scope="vm.ruleChainsScope" | 29 | rule-chains-scope="vm.ruleChainsScope" |
| 30 | + edge="vm.edge" | ||
| 30 | on-set-default-edge-rule-chain="vm.setDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" | 31 | on-set-default-edge-rule-chain="vm.setDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" |
| 31 | on-remove-default-edge-rule-chain="vm.removeDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" | 32 | on-remove-default-edge-rule-chain="vm.removeDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" |
| 32 | on-set-root-rule-chain="vm.setRootRuleChain(event, vm.grid.detailsConfig.currentItem)" | 33 | on-set-root-rule-chain="vm.setRootRuleChain(event, vm.grid.detailsConfig.currentItem)" |