Index: openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	28 Oct 2005 17:55:35 -0000	1.20
+++ openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	4 Dec 2005 15:06:55 -0000	1.21
@@ -232,7 +232,7 @@
     set employee_list [contact::util::get_employees -organization_id $organization_id]
     foreach employee_id $employee_list {
 	# Only add the user if the user is already in the system as a user, not a person.
-	if {[contact::user_p $employee_id]} {
+	if {[contact::user_p -party_id $employee_id]} {
 	    # Just to be on the save side, we actually check if the user is already in .LRN
 	    dotlrn::user_add -user_id $employee_id
 	    dotlrn_club::add_user -community_id $club_id -user_id $employee_id
Index: openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	10 Sep 2005 05:44:50 -0000	1.11
+++ openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	4 Dec 2005 15:06:55 -0000	1.12
@@ -9,7 +9,7 @@
   </querytext>
 </fullquery>
 
-<fullquery name="contact::groups.get_groups">
+<fullquery name="contact::groups_not_cached.get_groups">
   <querytext>
     select groups.group_id,
            acs_objects.title as group_name,
@@ -26,7 +26,7 @@
   </querytext>
 </fullquery>
 
-<fullquery name="contact::groups.get_components">
+<fullquery name="contact::groups_not_cached.get_components">
   <querytext>
             select groups.group_id,
                    groups.group_name,
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -N -r1.38 -r1.39
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	28 Oct 2005 17:55:35 -0000	1.38
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	4 Dec 2005 15:06:55 -0000	1.39
@@ -513,6 +513,18 @@
     {-no_member_count:boolean}
 } {
 } {
+    return [util_memoize [list contact::groups_not_cached -expand $expand -indent_with $indent_with -privilege_required $privilege_required -output $output -all_p $all_p -no_member_count_p $no_member_count_p]]
+}
+
+ad_proc -public contact::groups_not_cached {
+    {-expand "all"}
+    {-indent_with "..."}
+    {-privilege_required "read"}
+    {-output "list"}
+    {-all_p ""}
+    {-no_member_count_p ""}
+} {
+} {
     set user_id [ad_conn user_id]
     set group_list [list]
     # Filter clause
@@ -527,7 +539,7 @@
 	}
 
         if { $mapped_p || $all_p} {
-            lappend group_list [list [lang::util::localize $group_name] $group_id $member_count "1" $mapped_p $default_p]
+            lappend group_list [list $group_name $group_id $member_count "1" $mapped_p $default_p]
             if { $component_count > 0 && ( $expand == "all" || $expand == $group_id ) } {
                 db_foreach get_components {} {
 		    if { $mapped_p || $all_p} {
@@ -537,8 +549,7 @@
             }
         }
     }
-    set group_list [ams::util::localize_list_of_lists -list $group_list]
-
+    
     switch $output {
         list {
             set list_output [list]
Index: openacs-4/packages/contacts/www/admin/group-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/group-ae.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/contacts/www/admin/group-ae.tcl	7 Jun 2005 07:45:40 -0000	1.2
+++ openacs-4/packages/contacts/www/admin/group-ae.tcl	4 Dec 2005 15:06:55 -0000	1.3
@@ -101,8 +101,11 @@
 
 } -after_submit {
 
-        ad_returnredirect -message ${message} ${return_url}
-        ad_script_abort
+    # First flush our cache for the contact::groups as we change something here
+    util_memoize_flush_regexp [list contact::groups_not_cached .*]
+    
+    ad_returnredirect -message ${message} ${return_url}
+    ad_script_abort
 
 }
 
Index: openacs-4/packages/contacts/www/admin/group-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/group-map.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/contacts/www/admin/group-map.tcl	7 Jun 2005 07:45:40 -0000	1.2
+++ openacs-4/packages/contacts/www/admin/group-map.tcl	4 Dec 2005 15:06:55 -0000	1.3
@@ -47,8 +47,9 @@
     }
 }
 
+# First flush our cache for the contact::groups as we change something here
+util_memoize_flush_regexp [list contact::groups_not_cached .*]
 
-
 set package_id [ad_conn package_id]
 
 switch $action {
Index: openacs-4/packages/contacts/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/index.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/contacts/www/admin/index.tcl	31 Jul 2005 08:18:00 -0000	1.9
+++ openacs-4/packages/contacts/www/admin/index.tcl	4 Dec 2005 15:06:55 -0000	1.10
@@ -22,7 +22,7 @@
         edit {
 	    label {}
 	    display_template {
-		<a href="group-ae?group_id=@groups.group_id@"><img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border= "0" alt="[_ acs-kernel.common_Edit]"></a>
+		<a href="@groups.edit_url@"><img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border= "0" alt="[_ acs-kernel.common_Edit]"></a>
 	    }
 	}
         group_name {
@@ -85,7 +85,7 @@
     }
 
 
-multirow create groups group_id group_name group_url ams_person_url ams_org_url member_count level mapped_p default_p categories_url
+multirow create groups group_id group_name group_url ams_person_url ams_org_url member_count level mapped_p default_p categories_url edit_url
 
 set return_url [ad_conn url]
 foreach group [contact::groups -indent_with "..." -expand "all" -output "all" -privilege_required "admin" -all] {
@@ -109,8 +109,12 @@
                           -pretty_name "${package_id}__${group_id}" \
                           -return_url $return_url \
                           -return_url_label "[_ contacts.Return_to_title]"]
+
+    # The edit_url allows you to change the name of a group. As this is stored in I18N format, we change it accordingly there
+    set edit_url [export_vars -base "/acs-lang/admin/edit-localized-message" {{package_key acs-translations} {locale "[ad_conn locale]"} {message_key "group_title_${group_id}"} {return_url [ad_return_url]}}]
+
     set categories_url [export_vars -base "/categories/cadmin/object-map" -url {{object_id $group_id}}]
-    multirow append groups [lindex $group 1] [lindex $group 0] "../?group_id=${group_id}" $ams_person_url $ams_org_url $member_count $level $mapped_p $default_p $categories_url
+    multirow append groups [lindex $group 1] [lindex $group 0] "../?group_id=${group_id}" $ams_person_url $ams_org_url $member_count $level $mapped_p $default_p $categories_url $edit_url
 
 
 }