CC-2156: Searching for a host and hitting ENTER submits the show form
- done. Had to port the code manually
This commit is contained in:
parent
590a74b8ce
commit
ad708d9983
|
@ -63,6 +63,7 @@ class UserController extends Zend_Controller_Action
|
||||||
public function getHostsAction()
|
public function getHostsAction()
|
||||||
{
|
{
|
||||||
$search = $this->_getParam('term');
|
$search = $this->_getParam('term');
|
||||||
|
$res = Application_Model_User::getHosts($search);
|
||||||
$this->view->hosts = Application_Model_User::getHosts($search);
|
$this->view->hosts = Application_Model_User::getHosts($search);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm
|
||||||
$hosts = Application_Model_User::getHosts();
|
$hosts = Application_Model_User::getHosts();
|
||||||
|
|
||||||
foreach ($hosts as $host) {
|
foreach ($hosts as $host) {
|
||||||
$options[$host['value']] = $host['label'];
|
$options[$host['index']] = $host['label'];
|
||||||
}
|
}
|
||||||
|
|
||||||
//Add hosts selection
|
//Add hosts selection
|
||||||
|
|
|
@ -163,7 +163,7 @@ class Application_Model_User {
|
||||||
|
|
||||||
$sql;
|
$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;
|
$sql = $sql_gen;
|
||||||
|
|
||||||
if(is_array($type)) {
|
if(is_array($type)) {
|
||||||
|
|
|
@ -40,7 +40,7 @@ function createDateInput(el, onSelect) {
|
||||||
|
|
||||||
function autoSelect(event, ui) {
|
function autoSelect(event, ui) {
|
||||||
|
|
||||||
$("#add_show_hosts-"+ui.item.value).attr("checked", "checked");
|
$("#add_show_hosts-"+ui.item.index).attr("checked", "checked");
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,11 +50,21 @@ function findHosts(request, callback) {
|
||||||
url = "/User/get-hosts";
|
url = "/User/get-hosts";
|
||||||
search = request.term;
|
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,
|
$.post(url,
|
||||||
{format: "json", term: search},
|
{format: "json", term: search},
|
||||||
|
|
||||||
function(json) {
|
function(json) {
|
||||||
callback(json.hosts);
|
if(json.hosts.length<1){
|
||||||
|
callback(noResult);
|
||||||
|
}else{
|
||||||
|
callback(json.hosts);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -232,6 +242,12 @@ function setAddShowEvents() {
|
||||||
select: autoSelect,
|
select: autoSelect,
|
||||||
delay: 200
|
delay: 200
|
||||||
});
|
});
|
||||||
|
|
||||||
|
form.find("#add_show_hosts_autocomplete").keypress(function(e){
|
||||||
|
if( e.which == 13 ){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
form.find("#schedule-show-style input").ColorPicker({
|
form.find("#schedule-show-style input").ColorPicker({
|
||||||
onChange: function (hsb, hex, rgb, el) {
|
onChange: function (hsb, hex, rgb, el) {
|
||||||
|
|
Loading…
Reference in New Issue