search multiple words highlight + double result when object_id is in url

itf/app/models.py

@@ -274,6 +274,18 @@ class ItfModel(models.Model):
           operator = ''
         sort = operator + s['key']
         qset = qset.order_by(sort)
+
+
+    #FIXME: object_id needs to do something more graceful, this breaks sort.
+    if options['object_id'] != False and options['object_id'] != '':
+        object_id = options['object_id']
+        qset = qset.exclude(pk=object_id)
+        try:
+            obj = kls.objects.get(pk=object_id)
+            ret.append(obj.list_dict())
+        except:
+            pass
+
     '''
     r0 = options['range'][0]
     r1 = options['range'][1]
@@ -290,16 +302,6 @@ class ItfModel(models.Model):
     for r in results.object_list:
       ret.append(r.list_dict())
 
-    #FIXME: object_id needs to do something more graceful, this breaks sort.
-    if options['object_id'] != False and options['object_id'] != '':
-        object_id = options['object_id']
-        qset = qset.exclude(pk=object_id)
-        try:
-            obj = kls.objects.get(pk=object_id)
-            ret.append(obj.list_dict())
-        except:
-            pass
-
 
     return {
         'page_no': page_no,

itf/static/js/insidepage.js

@@ -25,7 +25,9 @@ $('#listLeft ul li a').live("click", function() {
         var searchTerm = $('.searchListField').val();
         var html = data.html;
         if (searchTerm != '') {
-            html = highlightWordsNoCase(html, searchTerm);
+            for (var i=0; i<searchTerm.split(" ").length; i++) {
+                html = highlightWordsNoCase(html, searchTerm.split(" ")[i]);
+            }
 //            html = html.replace(searchTerm, "<span class='highlight'>" + searchTerm + "</span>");    
         }
         $('#bottomRight').html(html);