Merge remote-tracking branch 'origin/saas-suspend' into saas
This commit is contained in:
commit
53def5af8d
|
@ -32,13 +32,13 @@ 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 ($_POST['provisioning_status']) {
|
||||
if (isset($_POST['provisioning_status'])) {
|
||||
Application_Model_Preference::setProvisioningStatus($_POST['provisioning_status']);
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
|
|
|
@ -1445,6 +1445,7 @@ class Application_Model_Preference
|
|||
|
||||
public static function setProvisioningStatus($status)
|
||||
{
|
||||
//See constants.php for the list of valid values. eg. PROVISIONING_STATUS_ACTIVE
|
||||
self::setValue("provisioning_status", $status);
|
||||
}
|
||||
|
||||
|
|
|
@ -3221,8 +3221,7 @@ dd .stream-status {
|
|||
.suspension_notice
|
||||
{
|
||||
text-align: center;
|
||||
background-color: #b87070;
|
||||
margin: 5px 5px;
|
||||
background-color: #D27A7A;
|
||||
padding: 20px;
|
||||
font-size: 16px;
|
||||
font-family: Helvetica, Arial, sans-serif;
|
||||
|
|
Loading…
Reference in New Issue