System announcements: Fix edit

pull/3984/head
Julio 4 years ago
parent ea1fc68336
commit 7df7b1d69f
  1. 3
      public/main/admin/system_announcements.php
  2. 4
      public/main/inc/lib/formvalidator/Element/DateRangePicker.php
  3. 3
      public/main/inc/lib/system_announcements.lib.php

@ -308,7 +308,7 @@ if ($action_todo) {
$form->addHidden('action', 'edit'); $form->addHidden('action', 'edit');
} }
$form->addElement('checkbox', 'send_email_test', null, get_lang('Send an email to myself for testing purposes.')); $form->addElement('checkbox', 'send_email_test', null, get_lang('Send an email to myself for testing purposes.'));
$form->addButtonSend($text, 'submit'); $form->addButtonSend($text);
$form->setDefaults($values); $form->setDefaults($values);
if ($form->validate()) { if ($form->validate()) {
@ -420,7 +420,6 @@ if ($action_todo) {
} }
if ($show_announcement_list) { if ($show_announcement_list) {
var_dump(api_get_url_entity()->getId());
$criteria = ['url' => api_get_url_entity()]; $criteria = ['url' => api_get_url_entity()];
$announcements = $repo->findBy($criteria); $announcements = $repo->findBy($criteria);
$announcement_data = []; $announcement_data = [];

@ -51,7 +51,7 @@ class DateRangePicker extends HTML_QuickForm_text
); );
} }
public function parseDateRange(array $dateRange): array public function parseDateRange(string $dateRange): array
{ {
$dateRange = Security::remove_XSS($dateRange); $dateRange = Security::remove_XSS($dateRange);
$dates = explode('/', $dateRange); $dates = explode('/', $dateRange);
@ -140,7 +140,7 @@ class DateRangePicker extends HTML_QuickForm_text
{ {
$js = null; $js = null;
$id = $this->getAttribute('id'); $id = $this->getAttribute('id');
$dateRange = $this->getAttribute('value'); $dateRange = (string) $this->getAttribute('value');
$defaultDates = null; $defaultDates = null;
if (!empty($dateRange)) { if (!empty($dateRange)) {

@ -336,12 +336,11 @@ class SystemAnnouncementManager
$promotionId = 0 $promotionId = 0
) { ) {
$sysRepo = Container::getSysAnnouncementRepository(); $sysRepo = Container::getSysAnnouncementRepository();
/** @var SysAnnouncement $announcement */ /** @var SysAnnouncement|null $announcement */
$announcement = $sysRepo->find($id); $announcement = $sysRepo->find($id);
if (null === $announcement) { if (null === $announcement) {
return false; return false;
} }
$a_dateS = explode(' ', $date_start); $a_dateS = explode(' ', $date_start);
$a_arraySD = explode('-', $a_dateS[0]); $a_arraySD = explode('-', $a_dateS[0]);
$a_arraySH = explode(':', $a_dateS[1]); $a_arraySH = explode(':', $a_dateS[1]);

Loading…
Cancel
Save