# HG changeset patch
# User jbe
# Date 1340573260 -7200
# Node ID df0b83d79524950a563a59b55ebd4c2020c87c96
# Parent  327f24e6799d22c1192c3674e58ce21a0cf0207d# Parent  5fb8f8326cb968f579c531b8c1b438e13936c85c
merge

diff -r 327f24e6799d -r df0b83d79524 app/main/area/show_tab.lua
--- a/app/main/area/show_tab.lua	Sun Jun 24 23:27:22 2012 +0200
+++ b/app/main/area/show_tab.lua	Sun Jun 24 23:27:40 2012 +0200
@@ -8,7 +8,7 @@
   :add_where("issue.closed NOTNULL")
   :add_order_by("issue.closed DESC")
 
-local members_selector = area:get_reference_selector("members")
+local members_selector = area:get_reference_selector("members"):add_where("member.active")
 local delegations_selector = area:get_reference_selector("delegations")
 
 local tabs = {
diff -r 327f24e6799d -r df0b83d79524 app/main/index/_index_member.lua
--- a/app/main/index/_index_member.lua	Sun Jun 24 23:27:22 2012 +0200
+++ b/app/main/index/_index_member.lua	Sun Jun 24 23:27:40 2012 +0200
@@ -57,7 +57,7 @@
   label = _"Members",
   module = 'member',
   view   = '_list',
-  params = { members_selector = Member:new_selector() }
+  params = { members_selector = Member:new_selector():add_where("active") }
 }
 
 
diff -r 327f24e6799d -r df0b83d79524 app/main/index/broken_delegations.lua
--- a/app/main/index/broken_delegations.lua	Sun Jun 24 23:27:22 2012 +0200
+++ b/app/main/index/broken_delegations.lua	Sun Jun 24 23:27:40 2012 +0200
@@ -1,3 +1,5 @@
+ui.title(_"Broken delegations")
+
 execute.view{
   module = "delegation",
   view = "_list",
diff -r 327f24e6799d -r df0b83d79524 app/main/index/search.lua
--- a/app/main/index/search.lua	Sun Jun 24 23:27:22 2012 +0200
+++ b/app/main/index/search.lua	Sun Jun 24 23:27:40 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 327f24e6799d -r df0b83d79524 app/main/member/_show_thumb.lua
--- a/app/main/member/_show_thumb.lua	Sun Jun 24 23:27:22 2012 +0200
+++ b/app/main/member/_show_thumb.lua	Sun Jun 24 23:27:40 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 327f24e6799d -r df0b83d79524 app/main/member/show.lua
--- a/app/main/member/show.lua	Sun Jun 24 23:27:22 2012 +0200
+++ b/app/main/member/show.lua	Sun Jun 24 23:27:40 2012 +0200
@@ -45,7 +45,14 @@
       slot.put(" · ")
       ui.tag{
         attr = { class = "interest deactivated_member_info" },
-        content = _"This member is deactivated."
+        content = _"This member is inactive"
+      }
+    end
+    if member.locked then
+      slot.put(" · ")
+      ui.tag{
+        attr = { class = "interest deactivated_member_info" },
+        content = _"This member is locked"
       }
     end
     if not (member.id == app.session.member.id) then
diff -r 327f24e6799d -r df0b83d79524 model/delegation.lua
--- a/model/delegation.lua	Sun Jun 24 23:27:22 2012 +0200
+++ b/model/delegation.lua	Sun Jun 24 23:27:40 2012 +0200
@@ -64,7 +64,8 @@
 
 function Delegation:selector_for_broken(member_id)
   return Delegation:new_selector()
-    :join("issue", nil, "issue.id = delegation.issue_id AND issue.closed ISNULL")
+    :left_join("issue", nil, "issue.id = delegation.issue_id")
+    :add_where("issue.id ISNULL OR issue.closed ISNULL")
     :join("member", nil, "delegation.trustee_id = member.id")
     :add_where{"delegation.truster_id = ?", member_id}
     :add_where{"member.active = 'f' OR (member.last_activity IS NULL OR age(member.last_activity) > ?::interval)", config.delegation_warning_time }
diff -r 327f24e6799d -r df0b83d79524 model/issue.lua
--- a/model/issue.lua	Sun Jun 24 23:27:22 2012 +0200
+++ b/model/issue.lua	Sun Jun 24 23:27:40 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
 
diff -r 327f24e6799d -r df0b83d79524 static/style.css
--- a/static/style.css	Sun Jun 24 23:27:22 2012 +0200
+++ b/static/style.css	Sun Jun 24 23:27:40 2012 +0200
@@ -412,6 +412,7 @@
 
 .page_head .unit_head .title,
 .page_head .area_head .title,
+.area_list .area .title,
 .issue .title {
   background-color: #eee;
   background-image: linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%);