Skip to content
Snippets Groups Projects
Commit 76e27978 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'hotline#73445_modifications_impossibles_sur_le_cosmo' into 'hotline'

Hotline#73445 modifications impossibles sur le cosmo

See merge request !2570
parents 6b5f166e f463328a
Branches
Tags
3 merge requests!2574Master,!2573Hotline,!2570Hotline#73445 modifications impossibles sur le cosmo
Pipeline #3774 passed with stage
in 34 minutes and 57 seconds
- ticket #73445 : Editions impossibles sur certaines pages de cosmogramame (profil des données ...)
\ No newline at end of file
......@@ -20,7 +20,7 @@
*/
class ZendAfi_Controller_Plugin_Manager_Annexe extends ZendAfi_Controller_Plugin_Manager_Manager {
class ZendAfi_Controller_Plugin_Manager_Annexe extends ZendAfi_Controller_Plugin_Manager_ExternalManager {
public function getActions($model) {
return [['url' => ['action' => 'edit',
'id' => $model->getId()],
......
......@@ -20,7 +20,7 @@
*/
class ZendAfi_Controller_Plugin_Manager_DataProfile extends ZendAfi_Controller_Plugin_Manager_Manager {
class ZendAfi_Controller_Plugin_Manager_DataProfile extends ZendAfi_Controller_Plugin_Manager_ExternalManager {
protected function _setupFormAndSave($model) {
$model = $this->_autoUpdateFormatInModel($model);
......
<?php
/**
* Copyright (c) 2012-2014, 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_Manager_ExternalManager extends ZendAfi_Controller_Plugin_Manager_Manager {
protected function _addQuery() {
}
}
\ No newline at end of file
......@@ -136,12 +136,17 @@ class ZendAfi_Controller_Plugin_Manager_Manager extends ZendAfi_Controller_Plugi
}
protected function _addQuery() {
$this->_helper->addQuery($this->_view);
}
public function editAction() {
if ($this->_response->isRedirect())
return;
$this->_helper->addQuery($this->_view);
$this->_addQuery();
if (!$model = $this->_findModel()) {
$this->_redirectToIndex();
return;
......
......@@ -20,7 +20,7 @@
*/
class ZendAfi_Controller_Plugin_Manager_Section extends ZendAfi_Controller_Plugin_Manager_Manager {
class ZendAfi_Controller_Plugin_Manager_Section extends ZendAfi_Controller_Plugin_Manager_ExternalManager {
public function getActions($model) {
return [['url' => ['action' => 'edit',
'id' => $model->getId()],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment