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

Merge from branch 1.3

Browse Source
This commit is contained in:
Michael RICOIS 2013-01-14 17:05:43 +00:00
commit 472529df5f
4 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Application/Controller/Plugin/Auth.php
View File

@ -140,6 +140,8 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
$view->admin = true;
}
Zend_Registry::get('firebug')->info($identity);
if (Zend_Session::namespaceIsset('login')){
Zend_Session::namespaceUnset('login');
}

2
library/Scores/Ciblage.php
View File

@ -35,7 +35,7 @@ class Ciblage
*/
public function __construct($structure = null, $filterRNCS = 0)
{
if ($filterRNCS===true) {
if ($filterRNCS==1) {
$this->filterRNCS();
}

1
public/themes/default/scripts/fields.js
View File

@ -84,7 +84,6 @@ $(document).ready(function()
select: function( event, ui ) {
if (ui.item.value != '') {
var name = $(this).parent().find('input.criteres').attr('name');
alert(name);
var selectObject = $('ul.selectqueries#'+name);
var oldhtml = selectObject.html();
var newhtml = '<li name="' + ui.item.value + '">' + ui.item.label + '</li>';

2
scripts/cron.php
View File

@ -66,5 +66,5 @@ $result = $commandesM->fetchAll($sql);
if (count($result)>0) {
$info = $result->current();
echo "Lancement enrichissement $info->id\n";
exec('php '.realpath(dirname(__FILE__))."/enrichissement.php --id ".$info->id." &");
exec('php '.realpath(dirname(__FILE__))."/scripts/jobs/enrichissement.php --id ".$info->id." &");
}