From ad708d9983cc583639b861f24ff39bf4837d854b Mon Sep 17 00:00:00 2001 From: james Date: Wed, 16 Nov 2011 18:14:10 -0500 Subject: [PATCH] CC-2156: Searching for a host and hitting ENTER submits the show form - done. Had to port the code manually --- .../controllers/UserController.php | 1 + airtime_mvc/application/forms/AddShowWho.php | 2 +- airtime_mvc/application/models/User.php | 2 +- .../public/js/airtime/schedule/add-show.js | 20 +++++++++++++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php index b84a0dede..37404931c 100644 --- a/airtime_mvc/application/controllers/UserController.php +++ b/airtime_mvc/application/controllers/UserController.php @@ -63,6 +63,7 @@ class UserController extends Zend_Controller_Action public function getHostsAction() { $search = $this->_getParam('term'); + $res = Application_Model_User::getHosts($search); $this->view->hosts = Application_Model_User::getHosts($search); } diff --git a/airtime_mvc/application/forms/AddShowWho.php b/airtime_mvc/application/forms/AddShowWho.php index 360a5abea..22dd109eb 100644 --- a/airtime_mvc/application/forms/AddShowWho.php +++ b/airtime_mvc/application/forms/AddShowWho.php @@ -16,7 +16,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm $hosts = Application_Model_User::getHosts(); foreach ($hosts as $host) { - $options[$host['value']] = $host['label']; + $options[$host['index']] = $host['label']; } //Add hosts selection diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 6f0ec13c7..81548f013 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -163,7 +163,7 @@ class Application_Model_User { $sql; - $sql_gen = "SELECT id AS value, login AS label FROM cc_subjs "; + $sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs "; $sql = $sql_gen; if(is_array($type)) { diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index 09e6a997e..0a7da3f8d 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -40,7 +40,7 @@ function createDateInput(el, onSelect) { function autoSelect(event, ui) { - $("#add_show_hosts-"+ui.item.value).attr("checked", "checked"); + $("#add_show_hosts-"+ui.item.index).attr("checked", "checked"); event.preventDefault(); } @@ -50,11 +50,21 @@ function findHosts(request, callback) { url = "/User/get-hosts"; search = request.term; + var noResult = new Array(); + noResult[0] = new Array(); + noResult[0]['value'] = $("#add_show_hosts_autocomplete").val(); + noResult[0]['label'] = "No result found"; + noResult[0]['index'] = null; + $.post(url, {format: "json", term: search}, function(json) { - callback(json.hosts); + if(json.hosts.length<1){ + callback(noResult); + }else{ + callback(json.hosts); + } }); } @@ -232,6 +242,12 @@ function setAddShowEvents() { select: autoSelect, delay: 200 }); + + form.find("#add_show_hosts_autocomplete").keypress(function(e){ + if( e.which == 13 ){ + return false; + } + }) form.find("#schedule-show-style input").ColorPicker({ onChange: function (hsb, hex, rgb, el) {