From 5857a8a7f399b64f1cd1bc17f19452e5e78c25bb Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Mon, 9 Jan 2017 16:52:47 +0100
Subject: [PATCH] migrate multiple resource definition to plugin
---
.../controllers/SuggestionAchatController.php | 19 +---------
.../admin/controllers/TypeDocsController.php | 23 +----------
library/ZendAfi/Controller/Action.php | 4 +-
.../Plugin/ResourceDefinition/DocType.php | 38 +++++++++++++++++++
.../Plugin/ResourceDefinition/FRBRLink.php | 2 +-
.../ResourceDefinition/FRBRLinkType.php | 2 +-
.../Plugin/ResourceDefinition/Lieu.php | 2 +-
.../ResourceDefinition/SuggestionAchat.php | 38 +++++++++++++++++++
8 files changed, 86 insertions(+), 42 deletions(-)
create mode 100644 library/ZendAfi/Controller/Plugin/ResourceDefinition/DocType.php
create mode 100644 library/ZendAfi/Controller/Plugin/ResourceDefinition/SuggestionAchat.php
diff --git a/application/modules/admin/controllers/SuggestionAchatController.php b/application/modules/admin/controllers/SuggestionAchatController.php
index 922310804fd..f0985fee4d3 100644
--- a/application/modules/admin/controllers/SuggestionAchatController.php
+++ b/application/modules/admin/controllers/SuggestionAchatController.php
@@ -22,23 +22,8 @@
class Admin_SuggestionAchatController extends ZendAfi_Controller_Action {
public function getPlugins() {
- return ['ZendAfi_Controller_Plugin_Manager_Manager'];
- }
-
-
- public function getRessourceDefinitions() {
- return [
- 'model' => ['class' => 'Class_SuggestionAchat',
- 'name' => 'suggestion',
- 'order' => 'date_creation'],
-
- 'messages' => ['successful_save' => 'Suggestion d\'achat %s sauvegardée'],
-
- 'actions' => ['edit' => ['title' => 'Modifier une suggestion d\'achat'],
- 'index' => ['title' => 'Suggestions d\'achat']],
-
- 'form' => (new ZendAfi_Form_SuggestionAchat())->removeSubmitButton() ];
+ return ['ZendAfi_Controller_Plugin_ResourceDefinition_SuggestionAchat',
+ 'ZendAfi_Controller_Plugin_Manager_Manager'];
}
}
-
?>
diff --git a/application/modules/admin/controllers/TypeDocsController.php b/application/modules/admin/controllers/TypeDocsController.php
index 70301e3aff4..a17b03128ff 100644
--- a/application/modules/admin/controllers/TypeDocsController.php
+++ b/application/modules/admin/controllers/TypeDocsController.php
@@ -22,26 +22,7 @@
class Admin_TypeDocsController extends ZendAfi_Controller_Action {
public function getPlugins() {
- return ['ZendAfi_Controller_Plugin_Manager_Manager'];
+ return ['ZendAfi_Controller_Plugin_ResourceDefinition_DocType',
+ 'ZendAfi_Controller_Plugin_Manager_Manager'];
}
-
-
- public function getRessourceDefinitions() {
- return [
- 'model' => ['class' => 'Class_TypeDoc',
- 'name' => 'type_doc',
- 'order' => 'libelle'],
- 'messages' => ['successful_save' => $this->_('Type de document %s modifié')],
-
- 'actions' => ['edit' => ['title' => 'Modification du type de document: %s'],
- 'index' => ['title' => 'Types de documents']
- ],
- 'after_edit' => function($model) {$this->_redirect('/admin/type-docs');},
- 'form' => ZendAfi_Form_TypeDocs_Edit::newWith($this->_getParam('id'))];
- }
-
-
}
-
-
-?>
\ No newline at end of file
diff --git a/library/ZendAfi/Controller/Action.php b/library/ZendAfi/Controller/Action.php
index 76d00112ae0..44f4d9ce4d1 100644
--- a/library/ZendAfi/Controller/Action.php
+++ b/library/ZendAfi/Controller/Action.php
@@ -141,7 +141,9 @@ class ZendAfi_Controller_Action extends Zend_Controller_Action {
$url .= '/' . $item . '/' . $value;
};
- $this->_definitions->withScopeDo($closure, $this->_request);
+ if($this->_definitions)
+ $this->_definitions->withScopeDo($closure, $this->_request);
+
$this->_redirect($url);
}
diff --git a/library/ZendAfi/Controller/Plugin/ResourceDefinition/DocType.php b/library/ZendAfi/Controller/Plugin/ResourceDefinition/DocType.php
new file mode 100644
index 00000000000..212a97af40d
--- /dev/null
+++ b/library/ZendAfi/Controller/Plugin/ResourceDefinition/DocType.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2012-2017, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class ZendAfi_Controller_Plugin_ResourceDefinition_DocType extends ZendAfi_Controller_Plugin_ResourceDefinition_Abstract {
+ public function getDefinitions() {
+ return [
+ 'model' => ['class' => 'Class_TypeDoc',
+ 'name' => 'type_doc',
+ 'order' => 'libelle'],
+ 'messages' => ['successful_save' => $this->_('Type de document %s modifié')],
+
+ 'actions' => ['edit' => ['title' => 'Modification du type de document: %s'],
+ 'index' => ['title' => 'Types de documents']
+ ],
+ 'after_edit' => function($model) {$this->_redirect('/admin/type-docs');},
+ 'form' => ZendAfi_Form_TypeDocs_Edit::newWith($this->_getParam('id'))];
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/ZendAfi/Controller/Plugin/ResourceDefinition/FRBRLink.php b/library/ZendAfi/Controller/Plugin/ResourceDefinition/FRBRLink.php
index 885f5bd8eb3..9484d479737 100644
--- a/library/ZendAfi/Controller/Plugin/ResourceDefinition/FRBRLink.php
+++ b/library/ZendAfi/Controller/Plugin/ResourceDefinition/FRBRLink.php
@@ -22,7 +22,7 @@
class ZendAfi_Controller_Plugin_ResourceDefinition_FRBRLink extends ZendAfi_Controller_Plugin_ResourceDefinition_Abstract {
- public function getRessourceDefinitions() {
+ public function getDefinitions() {
return [
'model' => ['class' => 'Class_FRBR_Link',
'name' => 'relation',
diff --git a/library/ZendAfi/Controller/Plugin/ResourceDefinition/FRBRLinkType.php b/library/ZendAfi/Controller/Plugin/ResourceDefinition/FRBRLinkType.php
index 721f8a70acd..087749fc918 100644
--- a/library/ZendAfi/Controller/Plugin/ResourceDefinition/FRBRLinkType.php
+++ b/library/ZendAfi/Controller/Plugin/ResourceDefinition/FRBRLinkType.php
@@ -22,7 +22,7 @@
class ZendAfi_Controller_Plugin_ResourceDefinition_FRBRLinkType extends ZendAfi_Controller_Plugin_ResourceDefinition_Abstract {
- public function getRessourceDefinitions() {
+ public function getDefinitions() {
return ['model' => ['class' => 'Class_FRBR_LinkType',
'name' => 'relation',
'order' => 'libelle'],
diff --git a/library/ZendAfi/Controller/Plugin/ResourceDefinition/Lieu.php b/library/ZendAfi/Controller/Plugin/ResourceDefinition/Lieu.php
index 7f34c007d71..79e01fc81e9 100644
--- a/library/ZendAfi/Controller/Plugin/ResourceDefinition/Lieu.php
+++ b/library/ZendAfi/Controller/Plugin/ResourceDefinition/Lieu.php
@@ -22,7 +22,7 @@
class ZendAfi_Controller_Plugin_ResourceDefinition_Lieu extends ZendAfi_Controller_Plugin_ResourceDefinition_Abstract {
- public function getRessourceDefinitions() {
+ public function getDefinitions() {
return ['model' => ['class' => 'Class_Lieu',
'name' => 'lieu',
'order' => 'libelle'],
diff --git a/library/ZendAfi/Controller/Plugin/ResourceDefinition/SuggestionAchat.php b/library/ZendAfi/Controller/Plugin/ResourceDefinition/SuggestionAchat.php
new file mode 100644
index 00000000000..b87f76894cb
--- /dev/null
+++ b/library/ZendAfi/Controller/Plugin/ResourceDefinition/SuggestionAchat.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2012-2017, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class ZendAfi_Controller_Plugin_ResourceDefinition_SuggestionAchat extends ZendAfi_Controller_Plugin_ResourceDefinition_Abstract {
+ public function getDefinitions() {
+ return [
+ 'model' => ['class' => 'Class_SuggestionAchat',
+ 'name' => 'suggestion',
+ 'order' => 'date_creation'],
+
+ 'messages' => ['successful_save' => 'Suggestion d\'achat %s sauvegardée'],
+
+ 'actions' => ['edit' => ['title' => 'Modifier une suggestion d\'achat'],
+ 'index' => ['title' => 'Suggestions d\'achat']],
+
+ 'form' => (new ZendAfi_Form_SuggestionAchat())->removeSubmitButton() ];
+ }
+}
+?>
\ No newline at end of file
--
GitLab