diff --git a/application/controllers/PlaylistController.php b/application/controllers/PlaylistController.php index 17d604c46..a047e47da 100644 --- a/application/controllers/PlaylistController.php +++ b/application/controllers/PlaylistController.php @@ -120,7 +120,9 @@ class PlaylistController extends Zend_Controller_Action $formdata = $form->getValues(); $pl = $this->getPlaylist(); - $pl->setName($formdata["title"]); + + if($formdata["title"]) + $pl->setName($formdata["title"]); if(isset($formdata["description"])) { $pl->setPLMetaData(UI_MDATA_KEY_DESCRIPTION, $formdata["description"]); diff --git a/application/forms/AddShowRepeats.php b/application/forms/AddShowRepeats.php index ec30c52fc..9e363257e 100644 --- a/application/forms/AddShowRepeats.php +++ b/application/forms/AddShowRepeats.php @@ -39,6 +39,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm $this->addElement('text', 'add_show_end_date', array( 'label' => 'Date End:', 'class' => 'input_text', + 'value' => date("Y-m-d"), 'required' => false, 'filters' => array('StringTrim'), 'validators' => array( diff --git a/application/forms/AddShowWhen.php b/application/forms/AddShowWhen.php index 5e876fabb..4467ee089 100644 --- a/application/forms/AddShowWhen.php +++ b/application/forms/AddShowWhen.php @@ -10,6 +10,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm 'label' => 'Date Start:', 'class' => 'input_text', 'required' => true, + 'value' => date("Y-m-d"), 'filters' => array('StringTrim'), 'validators' => array( 'NotEmpty', diff --git a/application/forms/PlaylistMetadata.php b/application/forms/PlaylistMetadata.php index 997620c45..4fc64ce39 100644 --- a/application/forms/PlaylistMetadata.php +++ b/application/forms/PlaylistMetadata.php @@ -8,7 +8,7 @@ class Application_Form_PlaylistMetadata extends Zend_Form // Add username element $this->addElement('text', 'title', array( 'label' => 'Title:', - 'required' => true, + 'required' => false, 'filters' => array('StringTrim'), 'validators' => array( 'NotEmpty', diff --git a/public/js/airtime/library/spl.js b/public/js/airtime/library/spl.js index 1885329a8..101ef9a2d 100644 --- a/public/js/airtime/library/spl.js +++ b/public/js/airtime/library/spl.js @@ -340,10 +340,6 @@ function createPlaylistMetaForm(json) { data = $("#side_playlist form").serialize(); $.post(url, data, function(json){ - if(json.form){ - - } - openDiffSPL(json); }) }); diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js index 092b8f9ac..e6e3fd08d 100644 --- a/public/js/airtime/schedule/add-show.js +++ b/public/js/airtime/schedule/add-show.js @@ -25,15 +25,12 @@ function endDpSelect(dateText, inst) { function createDateInput(el, onSelect) { var date; - + el.datepicker({ minDate: new Date(), onSelect: onSelect, dateFormat: 'yy-mm-dd' }); - - date = $.datepicker.formatDate("yy-mm-dd", new Date()); - el.val(date); } function autoSelect(event, ui) { diff --git a/public/js/airtime/schedule/full-calendar-functions.js b/public/js/airtime/schedule/full-calendar-functions.js index 4c6ec4ded..6a6aadc5c 100644 --- a/public/js/airtime/schedule/full-calendar-functions.js +++ b/public/js/airtime/schedule/full-calendar-functions.js @@ -124,7 +124,7 @@ function viewDisplay( view ) { opt.defaultView = view.name; $(calendarEl).fullCalendar('destroy'); $(calendarEl).fullCalendar(opt); - $(calendarEl).fullCalendar( 'gotoDate', d ) + $(calendarEl).fullCalendar( 'gotoDate', d ); }); var x = $(view.element).find(".fc-agenda-head th:first");