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

Merge

Browse Source
This commit is contained in:
Michael RICOIS 2012-06-11 12:38:29 +00:00
commit 4ffb8f00a3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/DashboardController.php
View File

@ -317,11 +317,11 @@ class DashboardController extends Zend_Controller_Action
//Read prefs table to load actual config
$prefsM = new Application_Model_Prefs();
$userPrefs = $prefsM->find($user->username)->current();
$userPrefs = $prefsM->find($user->username);
$data = array('interface'=>array(),'filter'=>array());
if ($userPrefs) {
$data = json_decode($userPrefs->json, true);
$data = json_decode($userPrefs->current()->json, true);
} else {
$prefsM->insert(array('login'=>$user->username, 'json'=>json_encode($data)));
}

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

@ -125,7 +125,7 @@ $(document).ready(function()
$('#tabs').delegate('a.autocompleteEx', 'click', function(e){
e.stopPropagation();
var obj = $(this).parent().find('input.criteres');
set(obj.attr('name'), obj.val());
set(obj.attr('name'), obj.val(), 1);
});
$('#tabs').delegate('a.selectMultiple', 'click', function(e){
@ -241,7 +241,7 @@ function set(key, value, ex)
$('#attente').css('display', 'block');
$('#panel').html('<img src="/themes/default/images/ajax.gif" />');
$.post('/comptage/index', { cle:key, valeur:value, exlcude:ex }, function(data, status) {
$.post('/comptage/index', { cle:key, valeur:value, exclude:ex }, function(data, status) {
var html = 'Nombre sélectionnées : <span class="valeur">'+data.count+'</span>';
if (data.insee>0) {
html = html + ' (dont <span class="valeur">'+data.insee +'</span> unité(s) insee)';