Merge pull request #10806 from JMAConsulting/CRM-20610-2

[civicrm-core.git] / ang / crmCxn / ManageCtrl.js

diff --git a/ang/crmCxn/ManageCtrl.js b/ang/crmCxn/ManageCtrl.js
index 12bba3c4e5aad7d5954e2270edd802845af68050..cd843c3304ae7a70508bef764e9dbff60be9131c 100644 (file)
--- a/ang/crmCxn/ManageCtrl.js
+++ b/ang/crmCxn/ManageCtrl.js
@@ -75,12 +75,20 @@
     };
 
     $scope.register = function(appMeta) {
-      var reg = crmApi('Cxn', 'register', {app_guid: appMeta.appId}).then($scope.refreshCxns);
+      var reg = crmApi('Cxn', 'register', {app_guid: appMeta.appId}).then($scope.refreshCxns).then(function() {
+        if (appMeta.links.welcome) {
+          return $scope.openLink(appMeta, 'welcome', {title: ts('%1: Welcome (External)', {1: appMeta.title})});
+        }
+      });
       return block(crmStatus({start: ts('Connecting...'), success: ts('Connected')}, reg));
     };
 
     $scope.reregister = function(appMeta) {
-      var reg = crmApi('Cxn', 'register', {app_guid: appMeta.appId}).then($scope.refreshCxns);
+      var reg = crmApi('Cxn', 'register', {app_guid: appMeta.appId}).then($scope.refreshCxns).then(function() {
+        if (appMeta.links.welcome) {
+          return $scope.openLink(appMeta, 'welcome', {title: ts('%1: Welcome (External)', {1: appMeta.title})});
+        }
+      });
       return block(crmStatus({start: ts('Reconnecting...'), success: ts('Reconnected')}, reg));
     };
 
@@ -98,7 +106,7 @@
     };
 
     $scope.openLink = function openLink(appMeta, page, options) {
-      var promise = crmApi('Cxn', 'getlink', {app_guid: appMeta.appId, page: page}).then(function(result) {
+      var promise = crmApi('Cxn', 'getlink', {app_guid: appMeta.appId, page_name: page}).then(function(result) {
         var mode = result.values.mode ? result.values.mode : 'popup';
         switch (result.values.mode) {
           case 'iframe':