Merge pull request #504 from maheeka/bug-fixes

remove Current Package in connector declaration and action invocation…
ballerina-attic · Feb 12, 2017 · 75a92df · 75a92df
2 parents 4d08d29 + d845b79
commit 75a92df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/modules/web/js/ballerina/ast/action-invocation-expression.js b/modules/web/js/ballerina/ast/action-invocation-expression.js
@@ -204,7 +204,8 @@ define(['lodash', 'log', './statement'], function (_, log, Statement) {
                 : (argsString = this.getConnectorVariableReference() + ' , ' + argsString);
         }
 
-        if (!_.isNil(this.getActionPackageName()) && !_.isEmpty(this.getActionPackageName().trim())) {
+        if (!_.isNil(this.getActionPackageName()) && !_.isEmpty(this.getActionPackageName().trim())
+                          && !_.isEqual(this.getActionPackageName().trim(), 'Current Package')) {
             if(this._isActionInvocationStatement){
                 return this.getActionPackageName() + ':' + this.getActionConnectorName() + '.' + this.getActionName() +
                     '(' + argsString +  ')';

diff --git a/modules/web/js/ballerina/item-provider/tool-palette-item-provider.js b/modules/web/js/ballerina/item-provider/tool-palette-item-provider.js
@@ -180,7 +180,7 @@ define(['log', 'lodash', './../env/package', './../tool-palette/tool-palette', '
                         action.classNames = "tool-connector-action tool-connector-last-action";
                     }
                     action.meta = {
-                        action: action.getAction(),
+                        action: action.getName(),
                         actionConnectorName: connector.getName(),
                         actionPackageName: packageName
                     };

diff --git a/modules/web/js/ballerina/visitors/source-gen/connector-declaration-visitor.js b/modules/web/js/ballerina/visitors/source-gen/connector-declaration-visitor.js
@@ -39,7 +39,8 @@ define(['lodash', 'log', 'event_channel', './abstract-source-gen-visitor'],
              * If we need to add additional parameters which are dynamically added to the configuration start
              * that particular source generation has to be constructed here
              */
-            var connectorPkg = !_.isNil(connectorDeclaration.getConnectorPkgName()) ?
+            var connectorPkg = ((!_.isNil(connectorDeclaration.getConnectorPkgName()))
+                                 && (!_.isEqual(connectorDeclaration.getConnectorPkgName(), 'Current Package'))) ?
                 (connectorDeclaration.getConnectorPkgName() + ":") : "";
             var constructedSource = connectorPkg +
                 connectorDeclaration.getConnectorName() + ' ' + connectorDeclaration.getConnectorVariable() +