Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / services / dataService.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
index 0e16355..6cc71b4 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
@@ -270,15 +270,15 @@ var DataService = function($log, DataService) {
                        }\r
                        return _this.aLaCarte;\r
                },\r
-               setShouldExcludeMacroFromAsyncInstatiationFlow: function (val) {\r
-                       _this.shouldExcludeMacroFromAsyncInstatiationFlow = val;\r
+        setShouldIncludeInAsyncInstantiationFlow: function (val) {\r
+            _this.shouldIncludeInAsyncInstantiationFlow = val;\r
         },\r
-        getShouldExcludeMacroFromAsyncInstatiationFlow: function(){\r
-            if (_this.shouldExcludeMacroFromAsyncInstatiationFlow === undefined) {\r
+        getShouldIncludeInAsyncInstantiationFlow: function(){\r
+            if (_this.shouldIncludeInAsyncInstantiationFlow === undefined) {\r
                 return false;\r
             }\r
-            return _this.shouldExcludeMacroFromAsyncInstatiationFlow;\r
-               },\r
+            return _this.shouldIncludeInAsyncInstantiationFlow;\r
+        },\r
                setMacro : function(aval) {\r
                        _this.macro = aval;\r
                },\r