|
|
@ -354,12 +354,11 @@ export default function RuleChainsController(ruleChainService, userService, impo |
|
|
return ruleChain; |
|
|
return ruleChain; |
|
|
}); |
|
|
}); |
|
|
ruleChains.data = data; |
|
|
ruleChains.data = data; |
|
|
|
|
|
|
|
|
deferred.resolve(ruleChains); |
|
|
deferred.resolve(ruleChains); |
|
|
}, function fail() { |
|
|
}, function fail() { |
|
|
deferred.reject(); |
|
|
deferred.reject(); |
|
|
} |
|
|
} |
|
|
) |
|
|
); |
|
|
return deferred.promise; |
|
|
return deferred.promise; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -368,19 +367,13 @@ export default function RuleChainsController(ruleChainService, userService, impo |
|
|
return ruleChainService.getRuleChains(pageLink, null, type); |
|
|
return ruleChainService.getRuleChains(pageLink, null, type); |
|
|
} else if (vm.ruleChainsScope === 'edges') { |
|
|
} else if (vm.ruleChainsScope === 'edges') { |
|
|
var deferred = $q.defer(); |
|
|
var deferred = $q.defer(); |
|
|
ruleChainService.getRuleChains(pageLink, null, type).then( |
|
|
ruleChainService.getRuleChains(pageLink, null, type) |
|
|
function success(ruleChains) { |
|
|
.then(function (ruleChains) { |
|
|
mapRuleChainsWithDefaultEdges(ruleChains).then( |
|
|
return mapRuleChainsWithDefaultEdges(ruleChains); |
|
|
function success(response) { |
|
|
}) |
|
|
deferred.resolve(response); |
|
|
.then(function (ruleChains) { |
|
|
}, function fail() { |
|
|
deferred.resolve(ruleChains); |
|
|
deferred.reject(); |
|
|
}); |
|
|
} |
|
|
|
|
|
); |
|
|
|
|
|
}, function fail() { |
|
|
|
|
|
deferred.reject(); |
|
|
|
|
|
} |
|
|
|
|
|
); |
|
|
|
|
|
return deferred.promise; |
|
|
return deferred.promise; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|