- Now offering to nuke users with undefined member_state

lib/user-admin-info.tcl

@@ -59,13 +59,18 @@ set activate_delete_link ""
 if {$admin} {
     append activate_delete_link "("
 
+set member_state xxxx
     switch $member_state {
 	"approved" {
 	    append activate_delete_link "<a href=/intranet/users/member-state-change?member_state=banned&[export_vars {user_id return_url}]>[_ intranet-core.delete]</a>"	
 	}
 	"banned" {
-	    append activate_delete_link "<a href=/acs-admin/users/member-state-change?member_state=approved&[export_vars {user_id return_url}]>[_ intranet-core.activate]</a>&nbsp;"
+	    append activate_delete_link "<a href=/acs-admin/users/member-state-change?member_state=approved&[export_vars {user_id return_url}]>[_ intranet-core.activate]</a>"
 	} 
+	default {
+	    append activate_delete_link "<a href=[export_vars -base "/intranet/users/nuke" {user_id return_url}]>[lang::message::lookup "" intranet-core.nuke Nuke]</a>"
+	}
+
     }
 
     append activate_delete_link ")"

www/users/nuke-2.tcl

@@ -35,14 +35,18 @@ if {!$admin} {
 
 
 db_1row user_full_name "
-    select
+    select 
+	first_names, last_name,
 	im_name_from_user_id(user_id) as user_name
     from
-        cc_users
-    where
-        user_id = :user_id
+	users u,
+	persons pe
+    where 
+	user_id = :user_id and
+	user_id = person_id
 "
 
+
 set return_to_admin_link "/intranet/users/"
 
 set page_title "[lang::message::lookup "" intranet-core.Nuke "Nuke"] $user_name"

www/users/nuke.tcl

@@ -47,9 +47,11 @@ db_1row user_full_name "
 	first_names, last_name,
 	im_name_from_user_id(user_id) as user_name
     from
-	cc_users
+	users u,
+	persons pe
     where 
-	user_id = :user_id
+	user_id = :user_id and
+	user_id = person_id
 "
 
 set page_title "[lang::message::lookup "" intranet-core.Nuke "Nuke"] $user_name"