Merge from ecomp 3374149f - AngularJS UI

Issue-ID: VID-378

Change-Id: I6b3243b492009035c911f63b93258ea76938fcb9
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js
index dd0ef7fb1..b9bab0eaf 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js
@@ -22,19 +22,19 @@
 

 var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCONFIGURATION, COMPONENT, DataService, featureFlags) {

     var shouldExcludeMacroFromAsyncInstantiationFlow = function(serviceModel){

-            if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ASYNC_INSTANTIATION))

-                return true;

-			if (DataService.getE2EService())

-				return true;

-            if (!_.isEmpty(serviceModel.pnfs))

-                return true;

-            if (!_.isEmpty(serviceModel.collectionResource))

-                return true;

-            if (!_.isEmpty(serviceModel.networks) && !featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_NETWORK_TO_ASYNC_INSTANTIATION))

-                return true;

-            if(serviceModel.service.instantiationType === "ClientConfig")

-                return true;

-            return false;

+        if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ASYNC_INSTANTIATION))

+            return true;

+        if (DataService.getE2EService())

+            return true;

+        if (!_.isEmpty(serviceModel.pnfs))

+            return true;

+        if (!_.isEmpty(serviceModel.collectionResources))

+            return true;

+        if (!_.isEmpty(serviceModel.networks) && !featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_NETWORK_TO_ASYNC_INSTANTIATION))

+            return true;

+        if(serviceModel.service.instantiationType === "ClientConfig")

+            return true;

+        return false;

     };

 

     return {