Showing
1 changed file
with
8 additions
and
8 deletions
... | ... | @@ -28,31 +28,31 @@ function ComponentDescriptorService($http, $q) { |
28 | 28 | |
29 | 29 | return service; |
30 | 30 | |
31 | - function getComponentDescriptorsByTypes(componentTypes, type) { | |
31 | + function getComponentDescriptorsByTypes(componentTypes, ruleChainType) { | |
32 | 32 | var deferred = $q.defer(); |
33 | 33 | var result = []; |
34 | - if (!componentsByType[type]) { | |
35 | - componentsByType[type] = {}; | |
34 | + if (!componentsByType[ruleChainType]) { | |
35 | + componentsByType[ruleChainType] = {}; | |
36 | 36 | } |
37 | 37 | for (var i=componentTypes.length-1;i>=0;i--) { |
38 | 38 | var componentType = componentTypes[i]; |
39 | - if (componentsByType[type][componentType]) { | |
40 | - result = result.concat(componentsByType[type][componentType]); | |
39 | + if (componentsByType[ruleChainType][componentType]) { | |
40 | + result = result.concat(componentsByType[ruleChainType][componentType]); | |
41 | 41 | componentTypes.splice(i, 1); |
42 | 42 | } |
43 | 43 | } |
44 | 44 | if (!componentTypes.length) { |
45 | 45 | deferred.resolve(result); |
46 | 46 | } else { |
47 | - var url = '/api/components?componentTypes=' + componentTypes.join(',') + '&ruleChainType=' + type; | |
47 | + var url = '/api/components?componentTypes=' + componentTypes.join(',') + '&ruleChainType=' + ruleChainType; | |
48 | 48 | $http.get(url, null).then(function success(response) { |
49 | 49 | var components = response.data; |
50 | 50 | for (var i = 0; i < components.length; i++) { |
51 | 51 | var component = components[i]; |
52 | - var componentsList = componentsByType[type][component.type]; | |
52 | + var componentsList = componentsByType[ruleChainType][component.type]; | |
53 | 53 | if (!componentsList) { |
54 | 54 | componentsList = []; |
55 | - componentsByType[type][component.type] = componentsList; | |
55 | + componentsByType[ruleChainType][component.type] = componentsList; | |
56 | 56 | } |
57 | 57 | componentsList.push(component); |
58 | 58 | componentsByClazz[component.clazz] = component; | ... | ... |