From 4d7ef3a0b1f87cbe6aa346ceb4060b0e795b4777 Mon Sep 17 00:00:00 2001 From: gloas <gloas@afi-sa.fr> Date: Tue, 10 Jan 2017 10:55:45 +0100 Subject: [PATCH] refacto --- library/Class/MultiSelection/Abstract.php | 9 +++- library/Class/MultiSelection/Album.php | 8 ---- library/Class/MultiSelection/Article.php | 9 ---- .../Controller/Plugin/Manager/Lieu.php | 1 - .../Controller/Plugin/Manager/Manager.php | 1 + .../Plugin/ResourceDefinition/Abstract.php | 45 ------------------- 6 files changed, 9 insertions(+), 64 deletions(-) diff --git a/library/Class/MultiSelection/Abstract.php b/library/Class/MultiSelection/Abstract.php index 802591a0665..433f901eacb 100644 --- a/library/Class/MultiSelection/Abstract.php +++ b/library/Class/MultiSelection/Abstract.php @@ -83,8 +83,15 @@ abstract class Class_MultiSelection_Abstract { } + public function acceptVisitor($visitor) { + $visitor + ->visitWidget($this) + ->visitActions($this); + return $this; + } + + abstract public function getModels(); - abstract public function acceptVisitor($visitor); abstract public function getModelIdsFromCategory($id); abstract protected function _getStorage(); } \ No newline at end of file diff --git a/library/Class/MultiSelection/Album.php b/library/Class/MultiSelection/Album.php index 80806dde39b..6d24ffe407e 100644 --- a/library/Class/MultiSelection/Album.php +++ b/library/Class/MultiSelection/Album.php @@ -40,14 +40,6 @@ class Class_MultiSelection_Album extends Class_MultiSelection_Abstract { } - public function acceptVisitor($visitor) { - $visitor - ->visitWidget($this) - ->visitActions($this); - return $this; - } - - public function acceptWidgetVisitor($visitor) { $models = $this->getModels(); $count = $models->count(); diff --git a/library/Class/MultiSelection/Article.php b/library/Class/MultiSelection/Article.php index 238063fb068..77e4e5d1b83 100644 --- a/library/Class/MultiSelection/Article.php +++ b/library/Class/MultiSelection/Article.php @@ -35,15 +35,6 @@ class Class_MultiSelection_Article extends Class_MultiSelection_Abstract { } - - public function acceptVisitor($visitor) { - $visitor - ->visitWidget($this) - ->visitActions($this); - return $this; - } - - public function acceptWidgetVisitor($visitor) { $models = $this->getModels(); $count = $models->count(); diff --git a/library/ZendAfi/Controller/Plugin/Manager/Lieu.php b/library/ZendAfi/Controller/Plugin/Manager/Lieu.php index a2a207df808..a6b2ca62c54 100644 --- a/library/ZendAfi/Controller/Plugin/Manager/Lieu.php +++ b/library/ZendAfi/Controller/Plugin/Manager/Lieu.php @@ -27,7 +27,6 @@ class ZendAfi_Controller_Plugin_Manager_Lieu extends ZendAfi_Controller_Plugin_M } - public function updateCoordinatesAction() { $this->_view->titre = $this->_view->_('Mise à jour automatique des coordonnées'); $this->_view->locations = Class_Lieu::findAllBy(['order' => 'libelle']); diff --git a/library/ZendAfi/Controller/Plugin/Manager/Manager.php b/library/ZendAfi/Controller/Plugin/Manager/Manager.php index 43da7be8c22..370bc48eaa1 100644 --- a/library/ZendAfi/Controller/Plugin/Manager/Manager.php +++ b/library/ZendAfi/Controller/Plugin/Manager/Manager.php @@ -29,6 +29,7 @@ class ZendAfi_Controller_Plugin_Manager_Manager extends ZendAfi_Controller_Plugi $this->_view->model_actions = $this->_getModelActions(); } + public function acceptVisitor($visitor) { $visitor->visitGetForm(function($model) { diff --git a/library/ZendAfi/Controller/Plugin/ResourceDefinition/Abstract.php b/library/ZendAfi/Controller/Plugin/ResourceDefinition/Abstract.php index 4b3c53a54b6..f6572732a08 100644 --- a/library/ZendAfi/Controller/Plugin/ResourceDefinition/Abstract.php +++ b/library/ZendAfi/Controller/Plugin/ResourceDefinition/Abstract.php @@ -354,50 +354,5 @@ abstract class ZendAfi_Controller_Plugin_ResourceDefinition_Abstract extends Zen $this->_view->model_name = $model_name; $this->_view->$model_name = $model; } - - - public function visitGetForm() { - return $this; - } - - - public function visitDoBeforeSave() { - return $this; - } - - - public function visitDoAfterSave() { - return $this; - } - - - public function visitCustomFieldModelValues() { - return $this; - } - - - public function visitCustomFieldForm() { - return $this; - } - - - public function visitDefaultModel() { - return $this; - } - - - public function visitProcessMultiCheckbox() { - return $this; - } - - - public function visitCustomValues() { - return $this; - } - - - public function visitAddModelToView() { - return $this; - } } ?> \ No newline at end of file -- GitLab