Skip to content
Snippets Groups Projects

Dev#18020 afim update

Merged Patrick Barroca requested to merge dev#18020-afim-update into stable
Compare and
+ 617
327
Preferences
Compare changes
Files
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class Admin_MultimediaController extends ZendAfi_Controller_Action {
@@ -39,7 +39,10 @@ class Admin_MultimediaController extends ZendAfi_Controller_Action {
'elements' => $this->getConfigFields()],
'config_auto' => ['legend' => 'Réservation automatique',
'elements' => $this->getConfigAutoFields()]
'elements' => $this->getConfigAutoFields()],
'config_auto_closing_days' => ['legend' => 'Réservation les jours de fermetures',
'elements' => $this->getConfigClosingDaysFields()]
]
];
}
@@ -49,7 +52,7 @@ class Admin_MultimediaController extends ZendAfi_Controller_Action {
$libelles = [];
foreach (Class_Bib::findAllBy(['order' => 'libelle']) as $bib)
$libelles[$bib->getId()] = $bib->getLibelle();
return ['id_site' => ['element' => 'select',
'options' => ['multioptions' => $libelles]]];
}
@@ -128,6 +131,29 @@ 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');
@@ -140,19 +166,19 @@ disponible',
'devices' => $devices]);
$this->_forward('index');
}
protected function _postEditAction($model) {
$this->view->titre = 'Modification du site multimédia "' . $this->view->escape($model->getLibelle()) . '"';
}
/** Les données viennent d'un serveur multimédia, pas de suppression */
public function deleteAction() {
$this->_redirect('/admin/multimedia');
}
/** Les données viennent d'un serveur multimédia, pas d'ajout */
public function addAction() {
$this->_redirect('/admin/multimedia');