Skip to content
Snippets Groups Projects

Master

Merged Ghislain Loas requested to merge master into dev_#21695_albums_list_view
Compare and
+ 2960
467
Preferences
Compare changes
Files
@@ -25,6 +25,7 @@ class Admin_AlbumController extends ZendAfi_Controller_Action {
'controller' => 'album'];
public function init() {
parent::init();
$this->view->titre = 'Collections';
Class_ScriptLoader::getInstance()
@@ -37,8 +38,8 @@ class Admin_AlbumController extends ZendAfi_Controller_Action {
$categories []= Class_AlbumCategorie::defaultCategory()
->setAlbums(Class_Album::findAllBy(['cat_id' => 0]));
$this->view->categories = [['bib' => Class_Bib::getPortail(),
'containers' => $categories]];
$this->view->categories = [ [ 'bib' => Class_Bib::getPortail(),
'containers' => $categories]];
$this->view->containersActions = $this->_getTreeViewContainerActions();
$this->view->itemsActions = $this->_getTreeViewItemActions();
$this->view->headScript()->appendScript('var treeViewSelectedCategory = '
@@ -517,7 +518,7 @@ class Admin_AlbumController extends ZendAfi_Controller_Action {
* @return Zend_Form
*/
protected function _albumForm($album) {
$form = ZendAfi_Form_Album::newWith($album);
$form = ZendAfi_Form_Album::newWithAlbum($album);
$form->addAttribs(['data-backurl' => $this->view->url(['action' => 'index',
'cat_id' => $album->getCatId()])]);
return $form;
@@ -549,6 +550,7 @@ class Admin_AlbumController extends ZendAfi_Controller_Action {
$values = $form->getValues();
unset($values['fichier']);
unset($values['pdf']);
unset($values['usage_constraints']);
$droits_precision = $values['droits_precision'];
unset($values['droits_precision']);