CC-5323: User's Timezone Can Improperly Edit Show
-made localizeDate a static function in ShowFormService
This commit is contained in:
parent
8ddb2974f1
commit
6aa6d576cd
|
@ -643,21 +643,16 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$this->_helper->json->sendJson(array("redrawLibTable" => $redrawLibTable));
|
||||
}
|
||||
|
||||
/**
|
||||
* When the timezone is changed in add-show form this function
|
||||
* applies the new timezone to the start and end time
|
||||
*/
|
||||
public function localizeStartEndTimeAction()
|
||||
{
|
||||
$service_showForm = new Application_Service_ShowFormService();
|
||||
$newTimezone = $this->_getParam('newTimezone');
|
||||
$oldTimezone = $this->_getParam('oldTimezone');
|
||||
$localTime = array();
|
||||
|
||||
$localTime["start"] = $service_showForm->localizeDateTime(
|
||||
$localTime["start"] = Application_Service_ShowFormService::localizeDateTime(
|
||||
$this->_getParam('startDate'), $this->_getParam('startTime'), $newTimezone, $oldTimezone);
|
||||
|
||||
$localTime["end"] = $service_showForm->localizeDateTime(
|
||||
$localTime["end"] = Application_Service_ShowFormService::localizeDateTime(
|
||||
$this->_getParam('endDate'), $this->_getParam('endTime'), $newTimezone, $oldTimezone);
|
||||
|
||||
$this->_helper->json->sendJson($localTime);
|
||||
|
|
|
@ -489,13 +489,14 @@ class Application_Service_ShowFormService
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Enter description here ...
|
||||
* When the timezone is changed in add-show form this function
|
||||
* applies the new timezone to the start and end time
|
||||
*
|
||||
* @param $date String
|
||||
* @param $time String
|
||||
* @param $timezone String
|
||||
*/
|
||||
public function localizeDateTime($date, $time, $newTimezone, $oldTimezone)
|
||||
public static function localizeDateTime($date, $time, $newTimezone, $oldTimezone)
|
||||
{
|
||||
$dt = new DateTime($date." ".$time, new DateTimeZone($oldTimezone));
|
||||
|
||||
|
|
Loading…
Reference in New Issue