Skip to content
Snippets Groups Projects

Stable

Merged Ghislain Loas requested to merge stable into hotline-master
Compare and
+ 328
223
Preferences
Compare changes
Files
@@ -39,10 +39,7 @@ class Admin_MultimediaController extends ZendAfi_Controller_Action {
'elements' => $this->getConfigFields()],
'config_auto' => ['legend' => 'Réservation automatique',
'elements' => $this->getConfigAutoFields()],
'config_auto_closing_days' => ['legend' => 'Réservation les jours de fermetures',
'elements' => $this->getConfigClosingDaysFields()]
'elements' => $this->getConfigAutoFields()]
]
];
}
@@ -131,29 +128,6 @@ disponible',
}
public function getConfigClosingDaysFields() {
$hours_select = Class_Multimedia_Location::getPossibleHours(30);
$fields['autohold_for_closing_days'] = ['element' => 'checkbox',
'options' => ['label' => 'Autoriser les réservations automatique pour les jours de fermeture
disponible',
'title' => 'Permet de définir des jours d\'utilisation des postes sans possibilités de réservation de bokeh',
'required' => true,
'allowEmpty' => false]];
$field_labels = ['open_hour' => $this->view->_('Heure d\'ouverture'),
'close_hour' => $this->view->_('Heure de fermeture')];
foreach ($field_labels as $field => $label)
$fields[$field] = ['element' => 'select', 'options' => ['label' => $label,
'multiOptions' => $hours_select]];
return $fields;
}
public function browseAction() {
if (!$location = Class_Multimedia_Location::find((int)$this->_getParam('id'))) {
$this->_redirect('/admin/multimedia');