Commit cf5f1cffdaaa999ecc836723291921de6ac739c2
Committed by
GitHub
Merge pull request #41 from deaflynx/feature/edge
Fix for fetch edge rule chains and deleted unused code
Showing
3 changed files
with
2 additions
and
10 deletions
@@ -284,13 +284,6 @@ function DashboardService($rootScope, $http, $q, $location, $filter) { | @@ -284,13 +284,6 @@ function DashboardService($rootScope, $http, $q, $location, $filter) { | ||
284 | } | 284 | } |
285 | dashboard.assignedCustomersText = assignedCustomersTitles.join(', '); | 285 | dashboard.assignedCustomersText = assignedCustomersTitles.join(', '); |
286 | } | 286 | } |
287 | - dashboard.assignedEdgesIds = []; | ||
288 | - if (dashboard.assignedEdges && dashboard.assignedEdges.length) { | ||
289 | - for (var j = 0; j < dashboard.assignedEdges.length; j++) { | ||
290 | - var assignedEdge = dashboard.assignedEdges[j]; | ||
291 | - dashboard.assignedEdgesIds.push(assignedEdge.edgeId.id); | ||
292 | - } | ||
293 | - } | ||
294 | return dashboard; | 287 | return dashboard; |
295 | } | 288 | } |
296 | 289 | ||
@@ -298,7 +291,6 @@ function DashboardService($rootScope, $http, $q, $location, $filter) { | @@ -298,7 +291,6 @@ function DashboardService($rootScope, $http, $q, $location, $filter) { | ||
298 | delete dashboard.publicCustomerId; | 291 | delete dashboard.publicCustomerId; |
299 | delete dashboard.assignedCustomersText; | 292 | delete dashboard.assignedCustomersText; |
300 | delete dashboard.assignedCustomersIds; | 293 | delete dashboard.assignedCustomersIds; |
301 | - delete dashboard.assignedEdgesIds; | ||
302 | return dashboard; | 294 | return dashboard; |
303 | } | 295 | } |
304 | 296 |
@@ -552,7 +552,7 @@ export function EdgeController($rootScope, userService, edgeService, customerSer | @@ -552,7 +552,7 @@ export function EdgeController($rootScope, userService, edgeService, customerSer | ||
552 | $event.stopPropagation(); | 552 | $event.stopPropagation(); |
553 | } | 553 | } |
554 | var pageSize = 10; | 554 | var pageSize = 10; |
555 | - ruleChainService.getRuleChains({limit: pageSize, textSearch: ''}).then( | 555 | + ruleChainService.getEdgesRuleChains({limit: pageSize, textSearch: ''}).then( |
556 | function success(_ruleChains) { | 556 | function success(_ruleChains) { |
557 | var ruleChains = { | 557 | var ruleChains = { |
558 | pageSize: pageSize, | 558 | pageSize: pageSize, |
@@ -53,7 +53,7 @@ export default function SetRootRuleChainToEdgesController(ruleChainService, edge | @@ -53,7 +53,7 @@ export default function SetRootRuleChainToEdgesController(ruleChainService, edge | ||
53 | fetchMoreItems_: function () { | 53 | fetchMoreItems_: function () { |
54 | if (vm.ruleChains.hasNext && !vm.ruleChains.pending) { | 54 | if (vm.ruleChains.hasNext && !vm.ruleChains.pending) { |
55 | vm.ruleChains.pending = true; | 55 | vm.ruleChains.pending = true; |
56 | - ruleChainService.getRuleChains(vm.ruleChains.nextPageLink).then( | 56 | + ruleChainService.getEdgesRuleChains(vm.ruleChains.nextPageLink).then( |
57 | function success(ruleChains) { | 57 | function success(ruleChains) { |
58 | vm.ruleChains.data = vm.ruleChains.data.concat(ruleChains.data); | 58 | vm.ruleChains.data = vm.ruleChains.data.concat(ruleChains.data); |
59 | vm.ruleChains.nextPageLink = ruleChains.nextPageLink; | 59 | vm.ruleChains.nextPageLink = ruleChains.nextPageLink; |