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

Merge

Browse Source
This commit is contained in:
Michael RICOIS 2012-05-29 15:52:05 +00:00
commit 951ab7efd4
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/controllers/ComptageController.php
View File

@ -35,11 +35,10 @@ class ComptageController extends Zend_Controller_Action
$auth = Zend_Auth::getInstance();
$user = $auth->getIdentity();
Zend_Registry::get('firebug')->info($user);
if ($user->preferences['interface']['insee']==1) {
$insee = null;
} else {
$insee = $ciblage->calculRedevanceInsee();
if ($user->preferences['interface']['insee']==1) {
$insee = $ciblage->calculRedevanceInsee();
} else {
$insee = null;
}
$fields->setNb('insee', $insee);

7
application/controllers/IndexController.php
View File

@ -105,12 +105,11 @@ class IndexController extends Zend_Controller_Action
$fields->setNb('total', $total);
$auth = Zend_Auth::getInstance();
$user = $auth->getIdentity();
Zend_Registry::get('firebug')->info($user);
$user = $auth->getIdentity();
if ($user->preferences['interface']['insee']==1) {
$insee = null;
} else {
$insee = $ciblage->calculRedevanceInsee();
} else {
$insee = null;
}
$fields->setNb('insee', $insee);

4
library/Application/Controller/Plugin/Comptage.php
View File

@ -48,9 +48,9 @@ class Application_Controller_Plugin_Comptage extends Zend_Controller_Plugin_Abst
$total = $ciblage->execute();
$session->setNb('total', $total);
if ($user->preferences['interface']['insee']==1) {
$insee = null;
} else {
$insee = $ciblage->calculRedevanceInsee();
} else {
$insee = null;
}
$session->setNb('insee', $insee);
}