From 185eb0fc007480252881f56868f67922dcb15de2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 15 Aug 2014 20:20:54 +0100
Subject: [PATCH] Update SMS providers form for 4.5

---
 CRM/SMS/Form/Provider.php           | 41 ++++++++++-------------------
 templates/CRM/SMS/Form/Provider.tpl | 15 +++++------
 2 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/CRM/SMS/Form/Provider.php b/CRM/SMS/Form/Provider.php
index b6dd2230ca..6ec36832fb 100644
--- a/CRM/SMS/Form/Provider.php
+++ b/CRM/SMS/Form/Provider.php
@@ -70,42 +70,29 @@ class CRM_SMS_Form_Provider extends CRM_Core_Form {
   public function buildQuickForm() {
     parent::buildQuickForm();
 
+    $this->addButtons(array(
+        array(
+          'type' => 'next',
+          'name' => $this->_action & CRM_Core_Action::DELETE ? ts('Delete') : ts('Save'),
+          'isDefault' => TRUE,
+        ),
+        array(
+          'type' => 'cancel',
+          'name' => ts('Cancel'),
+        ),
+      )
+    );
+
     if ($this->_action & CRM_Core_Action::DELETE) {
-      $this->addButtons(array(
-          array(
-            'type' => 'next',
-            'name' => ts('Delete'),
-            'isDefault' => TRUE,
-          ),
-          array(
-            'type' => 'cancel',
-            'name' => ts('Cancel'),
-          ),
-        )
-      );
       return;
     }
-    else {
-      $this->addButtons(array(
-          array(
-            'type' => 'next',
-            'name' => ts('Save'),
-            'isDefault' => TRUE,
-          ),
-          array(
-            'type' => 'cancel',
-            'name' => ts('Cancel'),
-          ),
-        )
-      );
-    }
 
     $attributes = CRM_Core_DAO::getAttribute('CRM_SMS_DAO_Provider');
 
     $providerNames = CRM_Core_OptionGroup::values('sms_provider_name', FALSE, FALSE, FALSE, NULL, 'label');
     $apiTypes = CRM_Core_OptionGroup::values('sms_api_type', FALSE, FALSE, FALSE, NULL, 'label');
 
-    $this->add('select', 'name', ts('Name'), array('' => '- select -') + $providerNames, TRUE, array('onchange' => "reload(true)"));
+    $this->add('select', 'name', ts('Name'), array('' => '- select -') + $providerNames, TRUE);
 
     $this->add('text', 'title', ts('Title'),
       $attributes['title'], TRUE
diff --git a/templates/CRM/SMS/Form/Provider.tpl b/templates/CRM/SMS/Form/Provider.tpl
index f75e6f1af8..a27b1360cc 100644
--- a/templates/CRM/SMS/Form/Provider.tpl
+++ b/templates/CRM/SMS/Form/Provider.tpl
@@ -77,14 +77,13 @@
 {if $action eq 1  or $action eq 2}
 <script type="text/javascript" >
 {literal}
-    function reload(refresh) {
-        var provider = document.getElementById("name");
-        var url = {/literal}"{$refreshURL}"{literal}
-        var post = url + "&key=" + provider.value;
-        if( refresh ) {
-            window.location.href = post;
-        }
-    }
+  CRM.$(function($) {
+    var $form = $("#{/literal}{$form.formName}{literal}");
+    $('select[name=name]', $form).change(function() {
+      var url = {/literal}"{$refreshURL}"{literal} + "&key=" + this.value;
+      $(this).closest('.crm-ajax-container, #crm-main-content-wrapper').crmSnippet({url: url}).crmSnippet('refresh');
+    });
+  });
 {/literal}
 </script>
 {/if}
-- 
2.25.1