# HG changeset patch
# User bsw
# Date 1325210844 -3600
# Node ID dac08fce1ab7913bac2886135b8335e7629e1a43
# Parent  df2d7ba9cc9b7af04d54d96fc8cd98c0bcbbcc95
Changed field active to activated in member views (according to core-2)

diff -r df2d7ba9cc9b -r dac08fce1ab7 app/main/member/_show_thumb.lua
--- a/app/main/member/_show_thumb.lua	Fri Dec 30 03:06:23 2011 +0100
+++ b/app/main/member/_show_thumb.lua	Fri Dec 30 03:07:24 2011 +0100
@@ -41,7 +41,7 @@
       attr = { class = "flags" },
       content = function()
 
-        if not member.active then
+        if not member.activated then
           local text = _"Member is deactivated"
           ui.image{
             attr = { alt = text, title = text },
diff -r df2d7ba9cc9b -r dac08fce1ab7 app/main/member/list.lua
--- a/app/main/member/list.lua	Fri Dec 30 03:06:23 2011 +0100
+++ b/app/main/member/list.lua	Fri Dec 30 03:07:24 2011 +0100
@@ -3,7 +3,7 @@
 util.help("member.list")
 
 local members_selector = Member:new_selector()
-  :add_where("active")
+  :add_where("activated NOTNULL")
 
 execute.view{
   module = "member",
diff -r df2d7ba9cc9b -r dac08fce1ab7 app/main/member/show.lua
--- a/app/main/member/show.lua	Fri Dec 30 03:06:23 2011 +0100
+++ b/app/main/member/show.lua	Fri Dec 30 03:07:24 2011 +0100
@@ -18,7 +18,7 @@
 
 slot.select("actions", function()
   if not (member.id == app.session.member.id) then
-if not member.active then
+if not member.activated then
   ui.tag{
     tag = "div",
     attr = { class = "interest deactivated_member_info" },
@@ -49,7 +49,7 @@
           }
         }
       }
-    elseif member.active then
+    elseif member.activated then
       ui.link{
         image   = { static = "icons/16/book_add.png" },
         text    = _"Add to my contacts",