[VID-12] Delivery of remaining features for v1.1

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / controller / ServiceModelController.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
index 5d382e9..dd2cf73 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -139,7 +139,7 @@
                                                                for (var i = 0; i < response.control.length; i++) {\r
                                                                        if (response.control[i].id == COMPONENT.SUBSCRIBER_NAME) {\r
                                                                                subscriberId = response.control[i].value;\r
-                                                                       } else if (response.control[i].id == "service-type") {\r
+                                                                       } else if (response.control[i].id == FIELD.ID.SERVICE_TYPE) {\r
                                                                                serviceType = response.control[i].value;\r
                                                                        }\r
                                                                }\r
@@ -182,8 +182,8 @@
                                        if (subVal[FIELD.ID.SERVICE_SUBSCRIPTIONS] != null) {\r
                                                        angular.forEach(subVal[FIELD.ID.SERVICE_SUBSCRIPTIONS][FIELD.ID.SERVICE_SUBSCRIPTION], function(serviceSubscription, key) {\r
                                                                $scope.serviceInstanceId = [];\r
-                                                               if (serviceSubscription[FIELD.ID.SERVICE_TYPE] != null) {\r
-                                                                       $scope.serviceType = serviceSubscription[FIELD.ID.SERVICE_TYPE];\r
+                                                               if (serviceSubscription[FIELD.ID.SERVICETYPE] != null) {\r
+                                                                       $scope.serviceType = serviceSubscription[FIELD.ID.SERVICETYPE];\r
                                                                } else {\r
                                                                        $scope.serviceType = FIELD.STATUS.NO_SERVICE_SUBSCRIPTION_FOUND;\r
                                                                }\r