Hotline #16241 duplicate article regression

application/modules/admin/controllers/CmsController.php

@@ -160,6 +160,12 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
protected function _updateNewModel($article) {
+		if ('newsduplicate' == $this->_request->getActionName()
+				&& $original = Class_Article::find($this->_getParam('id', 0))) {
+			$article->updateAttributes($original->copy()->toArray());
+			return $this;
+		}
+
$article->setAuteur(Class_Users::getIdentity());
if (!$category = $this->getCategoryAndSetComboCat())
@@ -193,31 +199,33 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
public function newsduplicateAction() {
-		$new_article = Class_Article::find($this->_getParam('id'))->copy();
-		$this->view->article		=  $new_article;
-		$this->view->titre			= $this->_('Dupliquer l\'article: ').$new_article->getTitre();
-		$this->view->combo_lieu_options = $this->comboLieuOptions();
-		$this->view->combo_cat = $this->view->comboCategories($new_article->getCategorie());
-		$this->view->form_action = $this->view->url(['module' => 'admin',
-																								 'controller' => 'cms',
-																								 'action' => 'add',
-																								 'id_cat' => $new_article->getIdCat()],
-																								null,
-																								true);
+		if (!$model = Class_Article::find($this->_getParam('id'))) {
+			$this->_redirect('admin/cms');
+			return;
+		}
+		$this->_setParam('id_cat', $model->getCategorie()->getId());
+		parent::addAction();
+		$this->view->titre = $this->_('Dupliquer l\'article: %s', $model->getTitre());
+		$this->view->form
+			->setAction($this->view->url(['module' => 'admin',
+																		'controller' => 'cms',
+																		'action' => 'add',
+																		'id_cat' => $model->getCategorie()->getId()],
+																	 null, true));
+		$this->render('add');
}
public function getCategoryAndSetComboCat() {
-		$category = Class_ArticleCategorie::getLoader()->find($this->_getParam('id_cat'));
-		if (null === $category) {
+		if (!$category = Class_ArticleCategorie::find($this->_getParam('id_cat'))) {
$this->_redirect('admin/cms');
return;
}
-		if (null === ($category->getBib())) {
+		if (null === ($category->getBib()))
$category->setBib($this->_bib);
-		}
+
$this->view->combo_cat = $this->view->comboCategories($category);
return $category;
}
@@ -531,7 +539,6 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
return $this->_($template, $model->getLibelle());
}
-
}
?>
\ No newline at end of file