liquid_feedback_frontend
diff app/main/index/search.lua @ 612:df0b83d79524
merge
author | jbe |
---|---|
date | Sun Jun 24 23:27:40 2012 +0200 (2012-06-24) |
parents | c4b878748205 |
children | 344e5fdce8c9 |
line diff
1.1 --- a/app/main/index/search.lua Sun Jun 24 23:27:22 2012 +0200 1.2 +++ b/app/main/index/search.lua Sun Jun 24 23:27:40 2012 +0200 1.3 @@ -21,8 +21,7 @@ 1.4 foreign_records = { 1.5 { id = "global", name = _"Global search" }, 1.6 { id = "member", name = _"Search for members" }, 1.7 - { id = "issue", name = _"Search for issues" }, 1.8 - { id = "initiative", name = _"Search for initiatives" }, 1.9 + { id = "issue", name = _"Search for issues" } 1.10 }, 1.11 foreign_id = "id", 1.12 foreign_name = "name", 1.13 @@ -45,16 +44,7 @@ 1.14 } 1.15 end 1.16 1.17 - if search_for == "global" or search_for == "initiative" then 1.18 - local initiatives_selector = Initiative:get_search_selector(search_string) 1.19 - execute.view{ 1.20 - module = "initiative", 1.21 - view = "_list", 1.22 - params = { initiatives_selector = initiatives_selector }, 1.23 - } 1.24 - end 1.25 - 1.26 - if search_for == "issue" then 1.27 + if search_for == "global" or search_for == "issue" then 1.28 local issues_selector = Issue:get_search_selector(search_string) 1.29 execute.view{ 1.30 module = "issue",