# HG changeset patch
# User bsw
# Date 1340572575 -7200
# Node ID c4b8787482051518a7835f69973128ceb24aa199
# Parent  42afe0765f867d0e21a433c88bbf060c6b72f7b0
Fixed errors in search

diff -r 42afe0765f86 -r c4b878748205 app/main/index/search.lua
--- a/app/main/index/search.lua	Sun Jun 24 23:08:24 2012 +0200
+++ b/app/main/index/search.lua	Sun Jun 24 23:16:15 2012 +0200
@@ -21,8 +21,7 @@
       foreign_records = {
         { id = "global", name = _"Global search" },
         { id = "member", name = _"Search for members" },
-        { id = "issue", name = _"Search for issues" },
-        { id = "initiative", name = _"Search for initiatives" },
+        { id = "issue", name = _"Search for issues" }
       },
       foreign_id = "id",
       foreign_name = "name",
@@ -45,16 +44,7 @@
     }
   end
 
-  if search_for == "global" or search_for == "initiative" then
-    local initiatives_selector = Initiative:get_search_selector(search_string)
-    execute.view{
-      module = "initiative",
-      view = "_list",
-      params = { initiatives_selector = initiatives_selector },
-    }
-  end
-
-  if search_for == "issue" then
+  if search_for == "global" or search_for == "issue" then
     local issues_selector = Issue:get_search_selector(search_string)
     execute.view{
       module = "issue",
diff -r 42afe0765f86 -r c4b878748205 app/main/member/_show_thumb.lua
--- a/app/main/member/_show_thumb.lua	Sun Jun 24 23:08:24 2012 +0200
+++ b/app/main/member/_show_thumb.lua	Sun Jun 24 23:16:15 2012 +0200
@@ -5,11 +5,11 @@
 local initiative = param.get("initiative", "table")
 local trustee = param.get("trustee", "table")
 
-local name
+local name_html
 if member.name_highlighted then
-  name = encode.highlight(member.name_highlighted)
+  name_html = encode.highlight(member.name_highlighted)
 else
-  name = encode.html(member.name)
+  name_html = encode.html(member.name)
 end
 
 local container_class = "member_thumb"
@@ -171,7 +171,7 @@
         }
         ui.container{
           attr = { class = "member_name" },
-          content = name
+          content = function() slot.put(name_html) end
         }
       end
     }
diff -r 42afe0765f86 -r c4b878748205 model/issue.lua
--- a/model/issue.lua	Sun Jun 24 23:08:24 2012 +0200
+++ b/model/issue.lua	Sun Jun 24 23:16:15 2012 +0200
@@ -215,8 +215,6 @@
     :add_group_by('"issue"."discussion_time"')
     :add_group_by('"issue"."verification_time"')
     :add_group_by('"issue"."voting_time"')
-    :add_group_by('"_interest"."member_id"')
-    :add_group_by("_delegating_interest.delegate_member_ids")
     --:set_distinct()
 end