scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

issue #0001776 : Affichage adresse à l'étranger

Browse Source
This commit is contained in:
Michael RICOIS 2013-11-13 12:57:33 +00:00
parent 36842614f5
commit 74e353d989
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/controllers/RechercheController.php
View File

@ -1,6 +1,7 @@
<?php
class RechercheController extends Zend_Controller_Action
{
protected $theme;
public function init()
{
@ -11,8 +12,8 @@ class RechercheController extends Zend_Controller_Action
require_once 'Scores/RechercheHistorique.php';
require_once 'Scores/WsScores.php';
$theme = Zend_Registry::get('theme');
$this->view->headScript()->appendFile($theme->pathScript.'/recherche.js', 'text/javascript');
$this->theme = Zend_Registry::get('theme');
$this->view->inlineScript()->appendFile($this->theme->pathScript.'/recherche.js', 'text/javascript');
}
public function indexAction()
@ -630,7 +631,6 @@ class RechercheController extends Zend_Controller_Action
} else {
$infoEtab.= '&Eacute;tablissement secondaire ';
}
Zend_Registry::get('firebug')->info('Nic: '.$etab->Nic.' , Siege: '.$etab->Siege);
if ($etab->Actif==1){
$infoEtab.= 'actif';
@ -668,7 +668,11 @@ class RechercheController extends Zend_Controller_Action
if (isset($etab->Adresse2) && $etab->Adresse2 != '') {
$adresse.= $etab->Adresse2.'<br/>';
}
$adresse.= "<b>".$etab->CP." ".$etab->Ville."</b>";
$adresse.= '<b>';
if ( intval($etab->CP) > 0) {
$adresse.= $etab->CP." ";
}
$adresse.= $etab->Ville."</b>";
if (null === $etab->Pays) {
$adresse.= '<br/><b>France</b>';