Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #56 from radiorabe/feature/version-reporting

Browse source 
Harmonize version reporting in ui and api
This commit is contained in:
Robb 2017-03-11 19:06:28 -05:00 • committed by GitHub
commit ff83784864
8 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/application/controllers/ApiController.php
View file

@ -105,8 +105,9 @@ class ApiController extends Zend_Controller_Action
public function versionAction()
{
$config = Config::getConfig();
$this->_helper->json->sendJson( array(
"airtime_version" => Application_Model_Preference::GetAirtimeVersion(),
"airtime_version" => $config['airtime_version'],
"api_version" => AIRTIME_API_VERSION));
}
@ -656,7 +657,8 @@ class ApiController extends Zend_Controller_Action
$this->_helper->json->sendJson(
array("jsonrpc" => "2.0", "error" => array("code" => $result['code'], "message" => $result['message']))
);
}*/
}
**/
}
public function uploadRecordedAction()
@ -915,10 +917,11 @@ class ApiController extends Zend_Controller_Action
{
$request = $this->getRequest();
$getDiskInfo = $request->getParam('diskinfo') == "true";
$config = Config::getConfig();
$status = array(
"platform"=>Application_Model_Systemstatus::GetPlatformInfo(),
"airtime_version"=>Application_Model_Preference::GetAirtimeVersion(),
"airtime_version"=>$config['airtime_version'],
"services"=>array(
"pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
"liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),

3
airtime_mvc/application/controllers/DashboardController.php
View file

@ -109,8 +109,9 @@ class DashboardController extends Zend_Controller_Action
public function aboutAction()
{
$config = Config::getConfig();
Zend_Layout::getMvcInstance()->assign('parent_page', 'Help');
$this->view->airtime_version = Application_Model_Preference::GetAirtimeVersion();
$this->view->airtime_version = $config['airtime_version'];
}
public function tableTestAction()

2
airtime_mvc/application/controllers/LoginController.php
View file

@ -114,7 +114,7 @@ class LoginController extends Zend_Controller_Action
}
$this->view->form = $form;
$this->view->airtimeVersion = Application_Model_Preference::GetAirtimeVersion();
$this->view->airtimeVersion = $CC_CONFIG['airtime_version'];
$this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
if (isset($CC_CONFIG['demo'])) {
$this->view->demo = $CC_CONFIG['demo'];