Merge branch 'master' of http://gitlab.geoint.mx/m3/m3_webInterface

catalog/views.py

@@ -115,10 +115,13 @@ def getNewsByRequest(request, values=None):
 	if "text" in request.GET and request.GET['text']!="None" and request.GET['text']!="":
 	#	myQuery &= Q(text__search=request.GET['text'])
 		myQuery &= Q(search_vector=request.GET['text'])
+		
 
 	print (myQuery)
-	
+#	if values is None:
 	return News.objects.filter(myQuery)
+#	else:
+#		return News.objects.filter(myQuery).values(",".join(values))
 #-------------------------------------------------------------------------------
 def status(request):
 	tPublishers = Publisher.objects.filter(type="texto").filter(active=True)
@@ -168,8 +171,8 @@ def index(request):
 	"""
 	View function for home page of site.
 	"""
-	values = ["publisher", "date", "search_vector", "text"]
-	news = getNewsByRequest(request)
+	values = ["publisher", "date", "search_vector"]#, "text"]
+	news = getNewsByRequest(request, values)
 	data = request.GET.copy()
 	form = SearchForm(data)
 
@@ -266,7 +269,8 @@ def newsDetails(request, newsId):
 	form = SearchForm(request.GET)
 	news = News.objects.get(id=newsId)
 
-#       news.text = news.text.replace(request.GET['text'], "<b>"+request.GET['text']+"</b>")
+	for i in request.GET['text'].split():
+		news.text = news.text.replace(i, "<b>"+i+"</b>")
 
 	return render(request,'new/newsDetails.html',{"form":form,"news":news})
 #-------------------------------------------------------------------------------