diff --git a/application/controllers/DirigeantController.php b/application/controllers/DirigeantController.php index 592d263f9..27fe26f3d 100644 --- a/application/controllers/DirigeantController.php +++ b/application/controllers/DirigeantController.php @@ -57,6 +57,9 @@ class DirigeantController extends Zend_Controller_Action $this->view->assign('exportObjet', $dirigeants); $this->view->assign('AutrePage', $this->getRequest()->getParam('apage')); + + $user = new Utilisateur(); + $this->view->assign('surveillance', $user->checkPerm('survdirigeants')); } /** @@ -86,6 +89,9 @@ class DirigeantController extends Zend_Controller_Action $this->view->assign('siret', $this->siret); $this->view->assign('raisonSociale', $session->getRaisonSociale()); $this->view->assign('infos', $infos); + + $user = new Utilisateur(); + $this->view->assign('surveillance', $user->checkPerm('survdirigeants')); } public function opAction() @@ -112,6 +118,9 @@ class DirigeantController extends Zend_Controller_Action $this->view->assign('dirigeants', $dirigeants); $this->view->assign('exportObjet', $dirigeants); - $this->view->assign('AutrePage', $this->getRequest()->getParam('apage')); + $this->view->assign('AutrePage', $this->getRequest()->getParam('apage')); + + $user = new Utilisateur(); + $this->view->assign('surveillance', $user->checkPerm('survdirigeants')); } } \ No newline at end of file diff --git a/application/controllers/EvaluationController.php b/application/controllers/EvaluationController.php index 2be292b39..0aea9c238 100644 --- a/application/controllers/EvaluationController.php +++ b/application/controllers/EvaluationController.php @@ -97,6 +97,8 @@ class EvaluationController extends Zend_Controller_Action $this->view->assign('indiscore', $infos); $this->view->assign('AutrePage', $autrePage); $this->view->assign('exportObjet', $infos); + + $this->view->assign('surveillance', $user->checkPerm('survscore')); } /** diff --git a/application/controllers/FinanceController.php b/application/controllers/FinanceController.php index c8abe8686..f77598221 100644 --- a/application/controllers/FinanceController.php +++ b/application/controllers/FinanceController.php @@ -931,6 +931,8 @@ class FinanceController extends Zend_Controller_Action if ( $user->checkPerm('UPLOADBILAN') ) { $this->view->assign('saisiebilan', true); } + $this->view->assign('surveillance', $user->checkPerm('survbilan')); + /** Partie vue **/ $this->view->haveLiasse = ($listBilan->nbReponses > 0) ? true : false; diff --git a/application/controllers/PiecesController.php b/application/controllers/PiecesController.php index 195ced7cd..152de73e4 100644 --- a/application/controllers/PiecesController.php +++ b/application/controllers/PiecesController.php @@ -340,6 +340,8 @@ class PiecesController extends Zend_Controller_Action $this->view->assign('siren', $siren); $this->view->assign('siret', $this->siret); $this->view->assign('raisonSociale', $this->entrep->getRaisonSociale()); + + $this->view->assign('surveillance', $user->checkPerm('survbilan')); } /** @@ -466,6 +468,8 @@ class PiecesController extends Zend_Controller_Action $this->view->assign('siren', $siren); $this->view->assign('siret', $this->siret); $this->view->assign('raisonSociale', $this->entrep->getRaisonSociale()); + + $this->view->assign('surveillance', $user->checkPerm('survactes')); } /** @@ -656,6 +660,9 @@ class PiecesController extends Zend_Controller_Action $session = new SessionEntreprise($this->siret, $this->id); $this->view->assign('raisonSociale', $session->getRaisonSociale()); + + $user = new Utilisateur(); + $this->view->assign('surveillance', $user->checkPerm('survactes')); } public function statutsAction() @@ -1716,6 +1723,9 @@ class PiecesController extends Zend_Controller_Action $this->view->assign('siren', $siren); $this->view->assign('siret', $this->siret); $this->view->assign('raisonSociale', $session->getRaisonSociale()); + + $user = new Utilisateur(); + $this->view->assign('surveillance', $user->checkPerm('survpriv')); } diff --git a/application/views/default/scripts/dirigeant/histo.phtml b/application/views/default/scripts/dirigeant/histo.phtml index 3ff425edd..26eb15ecd 100644 --- a/application/views/default/scripts/dirigeant/histo.phtml +++ b/application/views/default/scripts/dirigeant/histo.phtml @@ -16,6 +16,7 @@ Raison Sociale raisonSociale?> + surveillance) {?>   @@ -25,6 +26,7 @@ ))?> + diff --git a/application/views/default/scripts/dirigeant/liste.phtml b/application/views/default/scripts/dirigeant/liste.phtml index 7f4cd25ca..1c4da2962 100644 --- a/application/views/default/scripts/dirigeant/liste.phtml +++ b/application/views/default/scripts/dirigeant/liste.phtml @@ -20,6 +20,7 @@ Raison Sociale raisonSociale?> + surveillance) {?>   @@ -29,6 +30,7 @@ ))?> + dirigeantsop ){ ?>   @@ -36,8 +38,7 @@ Consulter la liste des dirigeants opérationnels - - + diff --git a/application/views/default/scripts/dirigeant/op.phtml b/application/views/default/scripts/dirigeant/op.phtml index 44857667a..854978c9a 100644 --- a/application/views/default/scripts/dirigeant/op.phtml +++ b/application/views/default/scripts/dirigeant/op.phtml @@ -20,6 +20,7 @@ Raison Sociale raisonSociale?> + surveillance) {?>   @@ -29,6 +30,7 @@ ))?> + diff --git a/application/views/default/scripts/evaluation/indiscore.phtml b/application/views/default/scripts/evaluation/indiscore.phtml index 738f3b074..b9df0daf7 100644 --- a/application/views/default/scripts/evaluation/indiscore.phtml +++ b/application/views/default/scripts/evaluation/indiscore.phtml @@ -90,6 +90,7 @@ indiscore->Tel?> + surveillance) {?> @@ -99,6 +100,7 @@ ));?> + diff --git a/application/views/default/scripts/finance/liasse.phtml b/application/views/default/scripts/finance/liasse.phtml index 31c02ece7..9da608d60 100644 --- a/application/views/default/scripts/finance/liasse.phtml +++ b/application/views/default/scripts/finance/liasse.phtml @@ -75,6 +75,7 @@ +surveillance) {?>   @@ -84,7 +85,7 @@ ))?> - + champType == 'S' ):?> Ce bilan a été déposé au format réel simplifié mais vous est livré au format réel normal pour des raisons de standardisation. diff --git a/application/views/default/scripts/giant/search.phtml b/application/views/default/scripts/giant/search.phtml index a1549ecc4..c05664213 100644 --- a/application/views/default/scripts/giant/search.phtml +++ b/application/views/default/scripts/giant/search.phtml @@ -40,7 +40,7 @@ - +

diff --git a/application/views/default/scripts/juridique/annonce.phtml b/application/views/default/scripts/juridique/annonce.phtml index 2f44ff561..15497e4de 100644 --- a/application/views/default/scripts/juridique/annonce.phtml +++ b/application/views/default/scripts/juridique/annonce.phtml @@ -26,7 +26,7 @@ - surveillance)):?> + surveillance) {?>   @@ -36,7 +36,7 @@ ))?> - + diff --git a/application/views/default/scripts/juridique/annonces.phtml b/application/views/default/scripts/juridique/annonces.phtml index 4d4c7998c..9be3eb89a 100644 --- a/application/views/default/scripts/juridique/annonces.phtml +++ b/application/views/default/scripts/juridique/annonces.phtml @@ -30,6 +30,7 @@ + surveillance) {?>   @@ -39,6 +40,7 @@ ))?> + diff --git a/application/views/default/scripts/pieces/actes.phtml b/application/views/default/scripts/pieces/actes.phtml index c1208cde6..e579b31dd 100644 --- a/application/views/default/scripts/pieces/actes.phtml +++ b/application/views/default/scripts/pieces/actes.phtml @@ -17,6 +17,7 @@ Raison Sociale raisonSociale?> + surveillance) {?>   @@ -26,6 +27,7 @@ ))?> + diff --git a/application/views/default/scripts/pieces/bilans.phtml b/application/views/default/scripts/pieces/bilans.phtml index a237f2ed6..7f2da71ca 100644 --- a/application/views/default/scripts/pieces/bilans.phtml +++ b/application/views/default/scripts/pieces/bilans.phtml @@ -17,6 +17,7 @@ Raison Sociale raisonSociale?> + surveillance) {?>   @@ -26,6 +27,7 @@ ))?> + diff --git a/application/views/default/scripts/pieces/privileges.phtml b/application/views/default/scripts/pieces/privileges.phtml index 8ee2be1b8..0713dca96 100644 --- a/application/views/default/scripts/pieces/privileges.phtml +++ b/application/views/default/scripts/pieces/privileges.phtml @@ -55,10 +55,12 @@ privileges)==0) { -?> +?> +surveillance) {?>

action('infos','surveillance', null, array('siret' => $this->siret, 'source'=>'privileges'))?>
+ detail) { echo $this->partial('pieces/privileges-details.phtml', array( diff --git a/application/views/default/scripts/pieces/sauvcmd.phtml b/application/views/default/scripts/pieces/sauvcmd.phtml index 9670ea090..f52b812db 100644 --- a/application/views/default/scripts/pieces/sauvcmd.phtml +++ b/application/views/default/scripts/pieces/sauvcmd.phtml @@ -17,6 +17,7 @@ Raison Sociale raisonSociale?> + surveillance) {?>   @@ -26,6 +27,7 @@ ))?> + diff --git a/library/Scores/Utilisateur.php b/library/Scores/Utilisateur.php index cd163e828..0b5610cdb 100644 --- a/library/Scores/Utilisateur.php +++ b/library/Scores/Utilisateur.php @@ -164,6 +164,7 @@ class Utilisateur * Vérifie que l'utilisateur possède bien un droits * @param string $perm * Le code de la permission + * @return boolean */ public function checkPerm($perm) {