1.1 --- a/app/main/member/_show_thumb.lua	Fri Dec 30 03:06:23 2011 +0100
     1.2 +++ b/app/main/member/_show_thumb.lua	Fri Dec 30 03:07:24 2011 +0100
     1.3 @@ -41,7 +41,7 @@
     1.4        attr = { class = "flags" },
     1.5        content = function()
     1.6  
     1.7 -        if not member.active then
     1.8 +        if not member.activated then
     1.9            local text = _"Member is deactivated"
    1.10            ui.image{
    1.11              attr = { alt = text, title = text },

     2.1 --- a/app/main/member/list.lua	Fri Dec 30 03:06:23 2011 +0100
     2.2 +++ b/app/main/member/list.lua	Fri Dec 30 03:07:24 2011 +0100
     2.3 @@ -3,7 +3,7 @@
     2.4  util.help("member.list")
     2.5  
     2.6  local members_selector = Member:new_selector()
     2.7 -  :add_where("active")
     2.8 +  :add_where("activated NOTNULL")
     2.9  
    2.10  execute.view{
    2.11    module = "member",

     3.1 --- a/app/main/member/show.lua	Fri Dec 30 03:06:23 2011 +0100
     3.2 +++ b/app/main/member/show.lua	Fri Dec 30 03:07:24 2011 +0100
     3.3 @@ -18,7 +18,7 @@
     3.4  
     3.5  slot.select("actions", function()
     3.6    if not (member.id == app.session.member.id) then
     3.7 -if not member.active then
     3.8 +if not member.activated then
     3.9    ui.tag{
    3.10      tag = "div",
    3.11      attr = { class = "interest deactivated_member_info" },
    3.12 @@ -49,7 +49,7 @@
    3.13            }
    3.14          }
    3.15        }
    3.16 -    elseif member.active then
    3.17 +    elseif member.activated then
    3.18        ui.link{
    3.19          image   = { static = "icons/16/book_add.png" },
    3.20          text    = _"Add to my contacts",