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

Merge branch 'saas-dev' into saas-speedy

Browse source
This commit is contained in:
Duncan Sommerville 2015-05-04 13:09:51 -04:00
commit 8b380086c3
32 changed files with 4981 additions and 1287 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@ class DashboardController extends Zend_Controller_Action
public function indexAction()
{
// action body
}
public function disconnectSourceAction()

7
airtime_mvc/application/controllers/ProvisioningController.php
View file

@ -32,12 +32,15 @@ class ProvisioningController extends Zend_Controller_Action
try {
// This is hacky and should be genericized
if ($_POST['station_name']) {
if (isset($_POST['station_name'])) {
Application_Model_Preference::SetStationName($_POST['station_name']);
}
if ($_POST['description']) {
if (isset($_POST['description'])) {
Application_Model_Preference::SetStationDescription($_POST['description']);
}
if (isset($_POST['provisioning_status'])) {
Application_Model_Preference::setProvisioningStatus($_POST['provisioning_status']);
}
} catch (Exception $e) {
$this->getResponse()
->setHttpResponseCode(400)