dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1023 from Sioxas/bugfix/modify-action-source

Browse Source 
Fix #1022
This commit is contained in:
Igor Kulikov 2018-10-04 14:45:06 +03:00 committed by GitHub
commit c16ab58806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/src/app/components/widget/action/manage-widget-actions.directive.js
View File

@ -244,13 +244,18 @@ function ManageWidgetActionsController($rootScope, $scope, $document, $mdDialog,
vm.widgetActions[actionSourceId] = targetActions; vm.widgetActions[actionSourceId] = targetActions;
} }
if (prevActionId) { if (prevActionId) {
var index = getActionIndex(prevActionId, vm.allActions); const indexInTarget = getActionIndex(prevActionId, targetActions);
if (index > -1) { const indexInAllActions = getActionIndex(prevActionId, vm.allActions);
vm.allActions[index] = action; if (indexInTarget > -1) {
targetActions[indexInTarget] = widgetAction;
} else if (indexInAllActions > -1) {
const prevActionSourceId = vm.allActions[indexInAllActions].actionSourceId;
const index = getActionIndex(prevActionId,vm.widgetActions[prevActionSourceId]);
vm.widgetActions[prevActionSourceId].splice(index,1);
targetActions.push(widgetAction);
} }
index = getActionIndex(prevActionId, targetActions); if (indexInAllActions > -1) {
if (index > -1) { vm.allActions[indexInAllActions] = action;
targetActions[index] = widgetAction;
} }
} else { } else {
vm.allActions.push(action); vm.allActions.push(action);