issue #0001653 : Don't display icon on other page, change permission name

This commit is contained in:
Michael RICOIS 2013-10-03 15:14:31 +00:00
parent 59ad7d69dd
commit 6cfde3219d
4 changed files with 10 additions and 6 deletions

View File

@ -33,17 +33,17 @@ class DirigeantController extends Zend_Controller_Action
}
$dirigeants = $infos->result->item;
$user = new Scores_Utilisateur();
$session = new SessionEntreprise($this->siret, $this->id);
if ($user->checkPerm('dirigeantsop')){
$href = $this->view->url(array('controller'=>'dirigeant', 'action'=>'op', 'siret'=>$this->siret));
$this->view->assign('dirigeantsop', $href);
}
$this->view->assign('edition', $user->checkModeEdition());
$this->view->assign('permission', $user->checkPerm('WORLDCHECK'));
$this->view->assign('accessWorldCheck', $user->checkPerm('WORLDCHECK'));
$this->view->assign('siren', $siren);
$this->view->assign('siret', $this->siret);

View File

@ -169,7 +169,7 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('raisonSociale', $session->getRaisonSociale());
$this->view->assign('infos', $infos);
$this->view->assign('siret', $infos->Siret);
$this->view->assign('permission', $user->checkPerm('WORLDCHECK'));
$this->view->assign('accessWorldCheck', $user->checkPerm('WORLDCHECK'));
$survDroits = array('survannonce', 'survinsee', 'survbilan', 'survscore', 'survactes', 'survdirigeants', 'survpriv');
$countSurvDroits = 0;

View File

@ -101,7 +101,7 @@ table.data td { border:1px solid #ccc; padding:5px; }
<?php }?>
</td>
<?php if (empty($this->AutrePage)) { ?>
<?php if( $this->permission ) { ?>
<?php if( $this->accessWorldCheck ) { ?>
<td>
<?php if ($dir->Societe != '') { ?>
<img class="wcheck" id="<?='/dirType/ORGANISATION/dirSociete/'.$dir->Societe;?>" src='/themes/default/images/worldcheck/wc.png'/>

View File

@ -58,7 +58,9 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreSiren']);
<h2>Raison sociale &amp; Coordonnées</h2>
<div class="paragraph">
<?php if($this->permission) { ?>
<?php if ( empty($this->AutrePage) ) {?>
<?php if($this->accessWorldCheck) { ?>
<div style="float:right;">
<img class="wcheck" src='/themes/default/images/worldcheck/wc.png'/>
</div>
@ -74,6 +76,8 @@ $('img.wcheck').each(function(){
});
</script>
<?php }?>
<?php }?>
<table>
<?php
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['RaisonSociale']);