liquid_feedback_frontend
diff app/main/index/search.lua @ 725:344e5fdce8c9
Fixed public search, made draft history available again
| author | bsw |
|---|---|
| date | Thu Jun 28 13:52:42 2012 +0200 (2012-06-28) |
| parents | c4b878748205 |
| children | ea2449916c12 |
line diff
1.1 --- a/app/main/index/search.lua Thu Jun 28 01:02:03 2012 +0200 1.2 +++ b/app/main/index/search.lua Thu Jun 28 13:52:42 2012 +0200 1.3 @@ -14,18 +14,21 @@ 1.4 } }, 1.5 attr = { class = "vertical" }, 1.6 content = function() 1.7 - ui.field.select{ 1.8 - label = _"Search context", 1.9 - name = "search_for", 1.10 - value = search_for, 1.11 - foreign_records = { 1.12 - { id = "global", name = _"Global search" }, 1.13 - { id = "member", name = _"Search for members" }, 1.14 - { id = "issue", name = _"Search for issues" } 1.15 - }, 1.16 - foreign_id = "id", 1.17 - foreign_name = "name", 1.18 - } 1.19 + 1.20 + if app.session.member_id or config.public_access == "full" then 1.21 + ui.field.select{ 1.22 + label = _"Search context", 1.23 + name = "search_for", 1.24 + value = search_for, 1.25 + foreign_records = { 1.26 + { id = "global", name = _"Global search" }, 1.27 + { id = "member", name = _"Search for members" }, 1.28 + { id = "issue", name = _"Search for issues" } 1.29 + }, 1.30 + foreign_id = "id", 1.31 + foreign_name = "name", 1.32 + } 1.33 + end 1.34 ui.field.text{ label = _"Search term (only complete words)", name = "search", value = search_string } 1.35 ui.submit{ value = _"Start search" } 1.36 end 1.37 @@ -35,15 +38,17 @@ 1.38 1.39 if search_string then 1.40 1.41 - if search_for == "global" or search_for == "member" then 1.42 - local members_selector = Member:get_search_selector(search_string) 1.43 - execute.view{ 1.44 - module = "member", 1.45 - view = "_list", 1.46 - params = { members_selector = members_selector }, 1.47 - } 1.48 + if app.session.member_id or config.public_access == "full" then 1.49 + if search_for == "global" or search_for == "member" then 1.50 + local members_selector = Member:get_search_selector(search_string) 1.51 + execute.view{ 1.52 + module = "member", 1.53 + view = "_list", 1.54 + params = { members_selector = members_selector }, 1.55 + } 1.56 + end 1.57 end 1.58 - 1.59 + 1.60 if search_for == "global" or search_for == "issue" then 1.61 local issues_selector = Issue:get_search_selector(search_string) 1.62 execute.view{