--- a/src/jocondelab/__init__.py Wed Dec 04 15:31:37 2013 +0100
+++ b/src/jocondelab/__init__.py Wed Dec 04 17:19:22 2013 +0100
@@ -1,4 +1,4 @@
-VERSION = (0, 28, 0, "final", 0)
+VERSION = (0, 29, 0, "final", 0)
def get_version():
--- a/src/jocondelab/views/ajax.py Wed Dec 04 15:31:37 2013 +0100
+++ b/src/jocondelab/views/ajax.py Wed Dec 04 17:19:22 2013 +0100
@@ -185,7 +185,10 @@
self.request.session['contribution_history'] = h
# Contributed Term is now validated and Dbpedia uris is regenerated by SPARQL Queries
- termobj, created = ContributedTerm.objects.get_or_create(dbpedia_uri=dbpedia_uri)
+ try:
+ termobj, _ = ContributedTerm.objects.get_or_create(dbpedia_uri=dbpedia_uri)
+ except:
+ return HttpResponseBadRequest()
controbj, created = Contribution.objects.get_or_create(term=termobj, thesaurus=thobj, notice=notobj, defaults={'contribution_count': 1})
if not created:
controbj.contribution_count += 1
--- a/src/jocondelab/views/front_office.py Wed Dec 04 15:31:37 2013 +0100
+++ b/src/jocondelab/views/front_office.py Wed Dec 04 17:19:22 2013 +0100
@@ -151,8 +151,8 @@
#TODO: test if paginator has page to avoid error
paginator = Paginator(qs.values_list('id', flat=True).order_by('id').distinct(), npp)
- ids = paginator.page(page)
context["page_count"] = paginator.num_pages
+ ids = paginator.page(min(page,paginator.num_pages))
context["count"] = paginator.count
if paginator.count==0:
context["wkinfo"] = None