# HG changeset patch
# User cavaliet
# Date 1389959785 -3600
# Node ID faec2aa5d9706d02cf19f9d7163cb239770c4f62
# Parent  0acdc712c384da98adaecd6e3a344a0cacf1de1f# Parent  a65b3fae6b38fb7bab12275d5434f5c23723dc83
Merge with a65b3fae6b38fb7bab12275d5434f5c23723dc83

diff -r 0acdc712c384 -r faec2aa5d970 src/jocondelab/views/ajax.py
--- a/src/jocondelab/views/ajax.py	Fri Jan 17 12:55:39 2014 +0100
+++ b/src/jocondelab/views/ajax.py	Fri Jan 17 12:56:25 2014 +0100
@@ -5,20 +5,21 @@
 @author: rvelt
 '''
 
-from jocondelab.models import DbpediaYears, DbpediaGeo, DbpediaFields, ContributedTerm, ContributedFields, Contribution
-from core.models import Notice, Thesaurus
-import django.utils.simplejson as json
-from django.core.paginator import Paginator
+import json
+import logging
+
+from django.conf import settings
+from django.db.models import Sum
 from django.http import HttpResponse
-from django.template.response import TemplateResponse
-from django.views.generic import TemplateView, DetailView
-from django.db.models import Sum
-from django.conf import settings
+from django.http.response import HttpResponseBadRequest
+from django.views.generic import TemplateView
 import requests
 
-import logging
-from django.http.response import HttpResponseBadRequest
-from distutils.command.config import LANG_EXT
+from core.models import Notice, Thesaurus
+from jocondelab.models import (DbpediaYears, DbpediaGeo, DbpediaFields, 
+    ContributedTerm, ContributedFields, Contribution)
+
+
 logger = logging.getLogger(__name__)
 
 def terms(request):
diff -r 0acdc712c384 -r faec2aa5d970 src/jocondelab/views/front_office.py
--- a/src/jocondelab/views/front_office.py	Fri Jan 17 12:55:39 2014 +0100
+++ b/src/jocondelab/views/front_office.py	Fri Jan 17 12:56:25 2014 +0100
@@ -5,6 +5,7 @@
 @author: rvelt
 '''
 
+import json
 import logging
 import math
 import random
@@ -20,7 +21,6 @@
 
 from core.models import Notice, Term, TERM_WK_LINK_SEMANTIC_LEVEL_DICT
 from core.models.term import Thesaurus
-import django.utils.simplejson as json
 from jocondelab.models import (DbpediaFields, Country, ContributableTerm, 
     TagcloudTerm)
 from jocondelab.utils import JocondeFrontPaginator
@@ -100,7 +100,10 @@
             
             if not cache.get('notice_count'):
                 cache.set('notice_count', qs.count(), settings.DB_QUERY_CACHE_TIME)
-            context["count"] = cache.get('notice_count')
+            context_count = cache.get('notice_count')
+            if not context_count:
+                context_count = qs.count()
+            context["count"] = context_count
             # Optimize random : order_by('?') is too slow
             # generate_series(1, 100) and not generate_series(1, 12) to be sure we have existing ids
             orm_request = """