Skip to content
Snippets Groups Projects

Master

Merged Patrick Barroca requested to merge master into dev#15224-workflow-with-n-validations
Compare and
+ 2076
761
Preferences
Compare changes
Files
@@ -269,11 +269,20 @@ class Admin_AccueilController extends Zend_Controller_Action {
}
$this->view->styles_liste = $this->_getStylesListes();
$this->view->flash_selected = $this->isAFlashStyleSelected();
$this->view->catalogues = Class_Catalogue::getCataloguesForCombo();
$this->view->paniers = Class_PanierNotice::getPaniersForCombo();
}
protected function isAFlashStyleSelected() {
if($this->_getParam('style_liste'))
return array_key_exists($this->_getParam('style_liste'), $this->_getStylesListes()['flash']);
return array_key_exists($this->view->preferences['style_liste'], $this->_getStylesListes()['flash']);
}
protected function _unsetStyleReload(&$enreg) {
if (array_key_exists('styles_reload', $enreg)) {
unset($enreg["styles_reload"]);
@@ -427,8 +436,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
}
/** @return array */
private function _getStylesListes() {
protected function _getStylesListes() {
// Styles HTML
$styles["html"]["vignettes"] = "Liste avec vignettes";
$styles["html"]["mur"] = "Mur";