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

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

diff --git a/ang/crmCxn/ManageCtrl.html b/ang/crmCxn/ManageCtrl.html
index a595143855eea6d095f3ad73407ade7dab7fa98e..2fe2f173c3b04ead071aa632a0b34adbd864047f 100644 (file)
--- a/ang/crmCxn/ManageCtrl.html
+++ b/ang/crmCxn/ManageCtrl.html
@@ -33,12 +33,9 @@
             >{{cxn.app_meta.title}}</a>
       </td>
       <td><div ng-bind-html="cxn.app_meta.desc"></div></td>
-      <td>{{cxn.is_active ? ts('Enabled') : ts('Disabled')}}</td>
+      <td>{{cxn.is_active=="1" ? ts('Enabled') : ts('Disabled')}}</td>
       <td>
         <span>
-            <!--
-            <a class="action-item crm-hover-button" ng-click="toggleCxn(cxn)">{{cxn.is_active ? ts('Disable') : ts('Enable') }}</a>
-            -->
             <a class="action-item crm-hover-button" ng-click="openLink(cxn.app_meta, 'settings', {title: ts('%1: Settings (External)', {1: cxn.app_meta.title})})" ng-show="cxn.app_meta.links.settings">{{ts('Settings')}}</a>
             <span class="btn-slide crm-hover-button">{{ts('more')}}
               <ul class="panel" style="display: none;">
@@ -57,6 +54,9 @@
                     {{ts('Support')}}
                   </a>
                 </li>
+                <li>
+                  <a class="action-item crm-hover-button" ng-click="toggleCxn(cxn)">{{ cxn.is_active=="1" ? ts('Disable') : ts('Enable')}}</a>
+                </li>
                 <li>
                   <a class="action-item crm-hover-button"
                      crm-confirm='{width: "65%", resizable: true, title:ts("%1: Reconnect", {1: cxn.app_meta.title}), templateUrl: "~/crmCxn/ConfirmReconnectCtrl.html", export: {cxn: cxn, appMeta: findAppByAppId(cxn.app_guid)}}'
@@ -111,7 +111,7 @@
   </table>
 </div>
 
-<div ng-show="$.isEmptyObject(appMetas)" class="messages status no-popup">
+<div ng-show="appMetas.length === 0" class="messages status no-popup">
   <i class="crm-i fa-info-circle"></i>
   {{ts('No available applications')}}
 </div>