diff --git a/airtime_mvc/application/controllers/DashboardController.php b/airtime_mvc/application/controllers/DashboardController.php
index 8b918137d..afdb26f33 100644
--- a/airtime_mvc/application/controllers/DashboardController.php
+++ b/airtime_mvc/application/controllers/DashboardController.php
@@ -35,7 +35,7 @@ class DashboardController extends Zend_Controller_Action
public function aboutAction()
{
- // action body
+ $this->view->airtime_version = Application_Model_Preference::GetAirtimeVersion();
}
}
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/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml
index 6a551c1e4..bdedfcfd2 100644
--- a/airtime_mvc/application/views/scripts/dashboard/about.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml
@@ -1,7 +1,7 @@
About
-Airtime , the open radio software for scheduling and remote station management.
+Airtime airtime_version ?>, the open radio software for scheduling and remote station management.
© 2011 Sourcefabric o.p.s 2011. Airtime is distributed under the GNU GPL v.3
diff --git a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
index 5417b35a6..020be44a9 100644
--- a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
+++ b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
@@ -1,7 +1,7 @@
stream_number;
?>
-
+
stream_number != '1'?'style="display: none;':''?> id="=$s_name?>-config">