Skip to content
Snippets Groups Projects
Commit decc85c0 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'hotline#56294_impossible_d_ajouter_une_ouverture_a_une_bib' into 'stable'

hotline #56294 fix  add id_site to openings

See merge request !2044
parents fd00ae50 dec12cad
Branches
Tags
5 merge requests!2080Sandbox detach zf from storm,!2061Master,!2048Master,!2047Hotline master,!2044hotline #56294 fix add id_site to openings
Pipeline #570 passed with stage
in 21 minutes and 47 seconds
- ticket #56294 : Administration : correction de l'ajout d'une ouverture à une bibliothèque
\ No newline at end of file
......@@ -39,6 +39,11 @@ class ZendAfi_Controller_Plugin_Manager_Opening extends ZendAfi_Controller_Plugi
}
protected function _doBeforeSave($model) {
return $model->setIdSite($this->_getParam('id_site', 0));
}
protected function _getSQLDateFrom($human_date) {
$date = implode('-', array_reverse(explode('/', $human_date)));
return strtotime($date) > 0
......
......@@ -576,15 +576,14 @@ class OuverturesControllerPostAddOuvertureCranTest extends OuverturesControllerT
public function setUp() {
parent::setUp();
$this->postDispatch('/admin/ouvertures/add', ['debut_matin' => '10:30',
'fin_matin' => '11:30',
'debut_apres_midi' => '14:00',
'fin_apres_midi' => '15:00',
'id_site' => 3,
'jour_semaine' => Class_Ouverture::MARDI,
'jour' => '23/10/2012',
'validity_start' => '00/00/0000',
'validity_end' => '']);
$this->postDispatch('/admin/ouvertures/add/id_site/3', ['debut_matin' => '10:30',
'fin_matin' => '11:30',
'debut_apres_midi' => '14:00',
'fin_apres_midi' => '15:00',
'jour_semaine' => Class_Ouverture::MARDI,
'jour' => '23/10/2012',
'validity_start' => '00/00/0000',
'validity_end' => '']);
$this->_new_ouverture = Class_Ouverture::find(46);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment