From 7e744959a72ca615ac098de18181c6556eb24c64 Mon Sep 17 00:00:00 2001 From: gloas <gloas@git-test.afi-sa.fr> Date: Mon, 13 Jan 2014 08:18:12 +0000 Subject: [PATCH] suppression xdebug_break() --- application/modules/admin/controllers/AuthController.php | 3 +-- library/Class/Codification.php | 2 +- library/ZendAfi/Auth/Adapter/CommSigb.php | 1 - library/ZendAfi/View/Helper/Accueil/Tags.php | 2 +- library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php | 4 ++-- library/ZendAfi/View/Helper/NuageTags.php | 1 - .../modules/admin/controllers/CmsControllerTest.php | 1 - 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/application/modules/admin/controllers/AuthController.php b/application/modules/admin/controllers/AuthController.php index 752f2b79f6d..51cf7b659a1 100644 --- a/application/modules/admin/controllers/AuthController.php +++ b/application/modules/admin/controllers/AuthController.php @@ -46,8 +46,7 @@ class Admin_AuthController extends Zend_Controller_Action // Formulaire d'identification //---------------------------------------------------------------------------------- function loginAction() { - xdebug_break(); - $this->view->message = ''; + $this->view->message = ''; if (!$this->_request->isPost()) return; diff --git a/library/Class/Codification.php b/library/Class/Codification.php index cf66ba90c6e..eb9154b26fd 100644 --- a/library/Class/Codification.php +++ b/library/Class/Codification.php @@ -142,7 +142,7 @@ class Class_Codification { "Y" => array($this->_("Site"), $this->_("Site")), "Z" => array($this->_("Tag"), $this->_("Tag(s)")), "8" => array($this->_("Lien internet"), $this->_("Liens internet")), - "9" => array($this->_("Nouveauté"), $this->_("Nouveauté"))]; + "9" => array($this->_("Nouveauté"), $this->_("Nouveauté"))]; $this->addThesauriToNomChamps(); $l=getVar("FACETTE_PCDM4_LIBELLE") ; if(trim($l)) {$this->_nom_champs["P"][0]=$l; $this->_nom_champs["P"][1]=$l; } diff --git a/library/ZendAfi/Auth/Adapter/CommSigb.php b/library/ZendAfi/Auth/Adapter/CommSigb.php index 33aa4a2939f..99e9cfd752a 100644 --- a/library/ZendAfi/Auth/Adapter/CommSigb.php +++ b/library/ZendAfi/Auth/Adapter/CommSigb.php @@ -65,7 +65,6 @@ class ZendAfi_Auth_Adapter_CommSigb implements Zend_Auth_Adapter_Interface { if ($user_from_sigb->getIdSigb()) $users_in_db = Class_Users::findAllBy(['id_sigb' => $user_from_sigb->getIdSigb()]); - xdebug_break(); if (count($users_in_db) != 1) { $users_in_db = Class_Users::findAllBy(['login' => $user_from_sigb->getLogin()]); if(1 < count($users_in_db)) diff --git a/library/ZendAfi/View/Helper/Accueil/Tags.php b/library/ZendAfi/View/Helper/Accueil/Tags.php index fd34e8a837a..cafc49100b4 100644 --- a/library/ZendAfi/View/Helper/Accueil/Tags.php +++ b/library/ZendAfi/View/Helper/Accueil/Tags.php @@ -20,7 +20,7 @@ */ class ZendAfi_View_Helper_Accueil_Tags extends ZendAfi_View_Helper_Accueil_Base { public function getHtml() { - /* Paramètres reçus + /* Paramètres reçus * limite: nombre de notices à analyser * nombre: nombre de notices à afficher dans le nuage * notices: 0: 'Toutes', bidon pour l'instant mais censé faire une recherche sur tout le catalogue diff --git a/library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php b/library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php index f37002dd3ae..a9f6e9638b4 100644 --- a/library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php +++ b/library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php @@ -35,8 +35,8 @@ class ZendAfi_View_Helper_Admin_TagSelectionChamps extends ZendAfi_View_Helper_B } if($rubrique == "tags") $champs="AFMDPZ"; if($rubrique == "champs") $champs="TJAMDPLGSBECNR9"; - if($rubrique == "type_tags") $champs="AMDPZ"; - if($rubrique == "champs_tags") $champs="AMDPZ"; + if($rubrique == "type_tags") $champs="AMDPZY"; + if($rubrique == "champs_tags") $champs="AMDPZY"; // Champs code et libelle $ret["codes_dispo"]='<script>codes_champ["'.$rubrique.'"]="'.$champs.'";</script>'; diff --git a/library/ZendAfi/View/Helper/NuageTags.php b/library/ZendAfi/View/Helper/NuageTags.php index 6bb9ceafcfa..9d2f1582148 100644 --- a/library/ZendAfi/View/Helper/NuageTags.php +++ b/library/ZendAfi/View/Helper/NuageTags.php @@ -26,7 +26,6 @@ class ZendAfi_View_Helper_NuageTags extends ZendAfi_View_Helper_BaseHelper { function nuageTags($tags,$calcul=3,$criteres_recherche=null) { Class_ScriptLoader::getInstance()->addSkinStyleSheet('nuage_tags'); - // Parametres if (!$tags) return; diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php index 690a7071691..a1fa7114000 100644 --- a/tests/application/modules/admin/controllers/CmsControllerTest.php +++ b/tests/application/modules/admin/controllers/CmsControllerTest.php @@ -1392,7 +1392,6 @@ class CmsControllerNewsAddActionPostWithWorkflowTest extends CmsControllerTestCa $this->getRequest()->setMethod('POST')->setPost($data); $this->dispatch('/admin/cms/newsadd/id_cat/23'); $this->_article = $this->article_wrapper->getFirstAttributeForLastCallOn('save'); - xdebug_break(); $this->assertEquals(['laurent@afi-sa.fr', 'bernard@afi-sa.fr'],$this->mock_transport->getSentMails()[0]->getRecipients()); } -- GitLab