data tables

catalog/views.py

@@ -277,7 +277,7 @@ def newsDetails(request, newsId):
 	form = SearchForm(request.GET)
 	news = News.objects.get(id=newsId)
 	news.text = news.text
-	if "text" in request.GET:
+	if "text" in request.GET and request["text"] != "" and request["text"] != None:
 		translator = str.maketrans('', '', string.punctuation)
 		searchtext = request.GET['text'].translate(translator)
 		print("search text:", searchtext)
@@ -389,7 +389,7 @@ def wsNewsListTable(request):#, publisherShortName="all"):
 
 	for n in news:
 		row = list()
-		txt =  ("?text="+ request.GET['text'] ) if ("text" in request.GET) and (request.GET["text"] is not None) else ""
+		txt =  ("?text="+ request.GET['text'] ) if ("text" in request.GET) and (request.GET["text"] is not None ) else ""
 
 		row.append('<a href="'+reverse('news-details', args =(n.id,) )+txt+'">'+ n.title+ '</a>')
 		row.append('<a href="'+n.url+'" target="blank">'+n.publisher.shortName+'</a>')