Skip to content
Snippets Groups Projects

Master

Merged Ghislain Loas requested to merge master into WIP
Compare and
+ 8
8
Preferences
Compare changes
Files
@@ -27,8 +27,7 @@ class ZendAfi_Form_Admin_News extends ZendAfi_Form {
->addAuthorFullName(isset($datas['id_user']) ? $datas['id_user'] : 0)
->addWorkflow(isset($datas['status']) ? $datas['status'] : '' )
->addPublication($datas['debut'], $datas['fin'])
->addAgenda($datas['all_day'], $datas['events_debut'], $datas['events_fin'])
->addDomainIndexation();
->addAgenda($datas['all_day'], $datas['events_debut'], $datas['events_fin']);
return $form;
}
@@ -88,7 +87,6 @@ class ZendAfi_Form_Admin_News extends ZendAfi_Form {
['label' => $this->_('Autoriser les commentaires d\'internautes (Mode blog) ?')])
->addElement('checkbox', 'indexation',
['label' => $this->_('Indexer l\'article dans le catalogue ?')])
->addElement('domainSelect', 'domaine_ids')
->addDisplayGroup([
'titre',
@@ -113,8 +111,9 @@ class ZendAfi_Form_Admin_News extends ZendAfi_Form {
'avis',
'indexation'],
'options',
['legend' => $this->_('Options')]);
;
['legend' => $this->_('Options')])
->addDomainIndexation();
$this->tags->getDecorator('label')->setOption('escape', false);
}
@@ -219,7 +218,8 @@ EOT;
protected function addDomainIndexation() {
if (defined('DEVELOPMENT'))
return $this->addDisplayGroup(['domaine_ids'], 'domains_set', ['legend' => $this->_('Indexation')]);
return $this->addElement('domainSelect', 'domaine_ids')
->addDisplayGroup(['domaine_ids'], 'domains_set', ['legend' => $this->_('Indexation')]);
return $this;
}