Index: openacs-4/packages/contacts/lib/contact-attributes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-attributes.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/contact-attributes.tcl	29 Jun 2005 00:47:49 -0000	1.2
+++ openacs-4/packages/contacts/lib/contact-attributes.tcl	15 Jul 2005 21:01:52 -0000	1.3
@@ -27,10 +27,10 @@
     set object_type "person"
 }
 set groups_belonging_to [db_list get_party_groups { select group_id from group_distinct_member_map where member_id = :party_id }]
-if { [lsearch $groups_belonging_to -2] < 0 } {
+if { [lsearch $groups_belonging_to [contacts::default_group]] < 0 } {
     ad_return_error "[_ contacts.lt_This_users_has_not_be]" "[_ contacts.lt_This_user_is_awaiting]"
 }
-set ams_forms [list "${package_id}__-2"]
+set ams_forms [list "${package_id}__[contacts::default_group]"]
 foreach group [contact::groups -expand "all" -privilege_required "read"] {
     set group_id [lindex $group 1]
     if { [lsearch $groups_belonging_to $group_id] >= 0 } {
Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/contacts/lib/contacts.tcl	15 Jul 2005 03:33:20 -0000	1.16
+++ openacs-4/packages/contacts/lib/contacts.tcl	15 Jul 2005 21:01:52 -0000	1.17
@@ -32,7 +32,7 @@
 
 set group_by_group_id ""
 if { ![exists_and_not_null group_id] } {
-    set where_group_id " = -2"
+    set where_group_id " = [contacts::default_group]"
 } else {
     if {[llength $group_id] > 1} {
 	set where_group_id " IN ('[join $group_id "','"]')"
Index: openacs-4/packages/contacts/lib/groups.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/groups.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/contacts/lib/groups.tcl	6 Jul 2005 23:36:19 -0000	1.7
+++ openacs-4/packages/contacts/lib/groups.tcl	15 Jul 2005 21:01:52 -0000	1.8
@@ -62,8 +62,9 @@
     }
 }
 
-if { [permission::permission_p -object_id "-2" -privilege "delete"] } {
-    set remove_url [export_vars -base "/contacts/group-parties-remove" -url {{group_id "-2"} party_id {return_url {/contacts/}}}] 
+set default_group [contacts::default_group]
+if { [permission::permission_p -object_id $default_group -privilege "delete"] } {
+    set remove_url [export_vars -base "/contacts/group-parties-remove" -url {{group_id $default_group} party_id {return_url {/contacts/}}}] 
     if { [db_0or1row contact_is_person { select 1 from acs_objects where object_id = :party_id and object_type = 'person' }] } {
         set upgrade_url [export_vars -base "/contacts/person-upgrade-to-user" -url {{person_id $party_id}}] 
     }
Index: openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.0d3-1.0d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.0d3-1.0d4.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.0d3-1.0d4.sql	7 Jul 2005 18:52:38 -0000	1.2
+++ openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.0d3-1.0d4.sql	15 Jul 2005 21:01:52 -0000	1.3
@@ -6,11 +6,13 @@
 --
 --
 
+select define_function_args('acs_user__new','user_id,object_type;user,creation_date;now(),creation_user,creation_ip,authority_id,username,email,url,first_names,last_name,password,salt,screen_name,email_verified_p;t,context_id');
+
+
 alter table contact_rels drop column comment; 
 alter table contact_rels drop column comment_format;
 
 -- create contact application groups
-
 create or replace function contacts_upgrade_1d3_to_1d4 ()
 returns integer as '
 declare
@@ -34,6 +36,19 @@
   LOOP
 
         RAISE NOTICE ''NEW GROUP ID IS %'', package.new_group_id;
+	UPDATE ams_lists
+           SET list_name = to_char(package.package_id,''FM9999999999999999'') || ''__'' || to_char(package.new_group_id,''FM9999999999999999'')
+         WHERE list_name = to_char(package.package_id,''FM9999999999999999'') || ''__-2'';
+
+	UPDATE contact_search_conditions
+           SET var_list = ''in '' || to_char(package.new_group_id,''FM9999999999999999'')
+         WHERE list_name = ''in -2'';
+
+	UPDATE contact_search_conditions
+           SET var_list = ''not_in '' || to_char(package.new_group_id,''FM9999999999999999'')
+         WHERE list_name = ''not_in -2'';
+
+        RAISE NOTICE ''NEW GROUP ID IS %'', package.new_group_id;
         FOR member IN select distinct member_id, acs_object__name(member_id) as name from group_member_map where group_id = ''-2''
         LOOP
 
Index: openacs-4/packages/contacts/tcl/contact-search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/contacts/tcl/contact-search-procs.tcl	15 Jul 2005 01:42:25 -0000	1.14
+++ openacs-4/packages/contacts/tcl/contact-search-procs.tcl	15 Jul 2005 21:01:52 -0000	1.15
@@ -172,7 +172,7 @@
       from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ),
            group_distinct_member_map
      where parties.party_id = group_distinct_member_map.member_id
-       and group_distinct_member_map.group_id = '-2'
+       and group_distinct_member_map.group_id = '[contacts::default_group]'
     [contact::search_clause -and -search_id $search_id -query "" -party_id "parties.party_id" -revision_id "revision_id"]
     "
     if { [exists_and_not_null query] } {
Index: openacs-4/packages/contacts/tcl/contact-search-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-procs.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/tcl/contact-search-procs.xql	28 Jun 2005 18:11:47 -0000	1.5
+++ openacs-4/packages/contacts/tcl/contact-search-procs.xql	15 Jul 2005 21:01:52 -0000	1.6
@@ -29,7 +29,7 @@
       from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ),
            group_distinct_member_map
      where parties.party_id = group_distinct_member_map.member_id
-       and group_distinct_member_map.group_id = '-2'
+       and group_distinct_member_map.group_id = '[contacts::default_group]'
     [contact::search_clause -and -search_id $search_id -query "" -party_id "parties.party_id" -revision_id "revision_id"]
   </querytext>
 </fullquery>
@@ -48,7 +48,7 @@
     select count(*)
       from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ) , group_distinct_member_map
      where parties.party_id = group_distinct_member_map.member_id
-       and group_distinct_member_map.group_id = '-2'
+       and group_distinct_member_map.group_id = '[contacts::default_group]'
     [contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"]
   </querytext>
 </fullquery>
Index: openacs-4/packages/contacts/tcl/contacts-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-install-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/contacts/tcl/contacts-install-procs.tcl	15 Jun 2005 19:12:35 -0000	1.10
+++ openacs-4/packages/contacts/tcl/contacts-install-procs.tcl	15 Jul 2005 21:01:52 -0000	1.11
@@ -70,11 +70,12 @@
 
     # users have some attributes mapped by default. This could be extended in custom packages.
 
+    set default_group [contacts::default_group -package_id $package_id]
     ams::widgets_init
     set list_id [ams::list::new \
 		     -package_key "contacts" \
 		     -object_type "person" \
-		     -list_name "${package_id}__-2" \
+		     -list_name "${package_id}__$default_group" \
 		     -pretty_name "Person - Registered Users" \
 		     -description "" \
 		     -description_mime_type ""]
@@ -168,7 +169,7 @@
     set list_id [ams::list::new \
 		     -package_key "contacts" \
 		     -object_type "organization" \
-		     -list_name "${package_id}__-2" \
+		     -list_name "${package_id}__$default_group" \
 		     -pretty_name "Organization - Registered Users" \
 		     -description "" \
 		     -description_mime_type ""]
@@ -203,7 +204,7 @@
 
     # Make the registered users group mapped by default
 
-    contacts::insert_map -group_id "-2" -default_p "t" -package_id $package_id
+    contacts::insert_map -group_id "$default_group" -default_p "t" -package_id $package_id
 }
 
 ad_proc -public contacts::install::package_mount {
Index: openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl	17 Jun 2005 05:44:38 -0000	1.5
+++ openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl	15 Jul 2005 21:01:52 -0000	1.6
@@ -37,7 +37,7 @@
 	set contacts_package_id $package_id
     }
 
-    set registered_user_group_id "-2"
+    set registered_user_group_id [contacts::default_group -package_id $package_id]
 
 
     # This is a check for the customer and supplier id if P/O is installed.
@@ -1702,4 +1702,4 @@
 	-sort_order "1" \
 	-required_p "f" \
 	-section_heading ""
-}
\ No newline at end of file
+}
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 -r1.7 -r1.8
--- openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	28 Jun 2005 19:47:08 -0000	1.7
+++ openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	15 Jul 2005 21:01:52 -0000	1.8
@@ -18,7 +18,7 @@
            CASE WHEN package_id is not null THEN '1' ELSE '0' END as mapped_p,
            CASE WHEN default_p THEN '1' ELSE '0' END as default_p
       from groups left join contact_groups on ( groups.group_id = contact_groups.group_id )
-     where groups.group_id not in ('-1','-2')
+     where groups.group_id not in ('-1','[contacts::default_group]')
        and groups.group_id not in ( select gcm.component_id from group_component_map gcm where gcm.group_id != -1 )
        and acs_permission__permission_p(groups.group_id,:user_id,:privilege_required)
      order by CASE WHEN contact_groups.default_p THEN '000000000' ELSE upper(groups.group_name) END
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 -r1.20 -r1.21
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	6 Jul 2005 23:38:22 -0000	1.20
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	15 Jul 2005 21:01:52 -0000	1.21
@@ -24,7 +24,8 @@
     if {[string is false [exists_and_not_null package_id]]} {
         set package_id [ad_conn package_id]
     }
-    return [db_string get_default_group {select group_id from contact_groups where package_id =:package_id and default_p} -default {}]
+#    return [db_string get_default_group {select group_id from contact_groups where package_id = :package_id and default_p} -default {}]
+    return [db_string get_default_group {select group_id from application_groups where package_id = :package_id } -default {}]
 }
 
 ad_proc -private contact::util::generate_filename {
@@ -326,6 +327,10 @@
         # we reset the password in admin mode. this means that an email
         # will not automatically be sent.
         auth::password::reset -authority_id [auth::authority::local] -username $username -admin
+	group::add_member \
+	    -group_id "-2" \
+	    -user_id $person_id \
+	    -rel_type "membership_rel"
     } on_error {
         error "There was an error in contact::person_upgrade_to_user: $errmsg"
     }
Index: openacs-4/packages/contacts/www/contact-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-add.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/contacts/www/contact-add.tcl	6 Jul 2005 23:37:19 -0000	1.24
+++ openacs-4/packages/contacts/www/contact-add.tcl	15 Jul 2005 21:01:52 -0000	1.25
@@ -18,10 +18,13 @@
     }
 }
 
-set group_list [concat [list [list [_ contacts.All_Contacts] "-2" "0"]] [contact::groups]]
+set default_group [contacts::default_group]
+
+
+set group_list [concat [list [list [_ contacts.All_Contacts] $default_group "0"]] [contact::groups]]
 if {[empty_string_p $group_ids] && [llength $group_list] > 1} {
     ad_returnredirect "[export_vars -base "../select-groups" -url {object_type}]"
-} elseif { [lsearch $group_ids "-2"] < 0 } {
+} elseif { [lsearch $group_ids $default_group] < 0 } {
     # an invalid group_ids list has been specified or they do not have permission to add person
     ad_return_error "[_ contacts.lt_Insufficient_Permissi]" "[_ contacts.lt_You_do_not_have_permi]"
 }
@@ -42,12 +45,10 @@
 lappend form_elements {rel_type:text(hidden),optional}
 lappend form_elements {object_id_two:text(hidden),optional}
 
-set default_group_id [contacts::default_group -package_id $package_id]
-set default_group_id "-2"
 set application_group_id [application_group::group_id_from_package_id -package_id [ad_conn subsite_id]]
 
-if {[lsearch $group_ids $default_group_id] == -1} {
-    lappend group_ids $default_group_id
+if {[lsearch $group_ids $default_group] == -1} {
+    lappend group_ids $default_group
 }
 
 lappend form_elements {group_ids:text(hidden)}
@@ -58,7 +59,7 @@
 }
 
 set group_list [contact::groups -expand "all" -privilege_required "read"]
-set group_list "{{All Contacts} -2 0} $group_list"
+set group_list "{{All Contacts} $default_group 0} $group_list"
 
 
 ad_form -name party_ae \
@@ -105,6 +106,7 @@
 		 {label ""} 
 		 {options {{"[_ contacts.Create_a_user_account_for_this_person]" "t"}}} 
 		 {values ""}
+                 {section "[_ contacts.User_Account_Information]"}
 	     }
 	 }
     set title "[_ contacts.Add_a_Person]"
Index: openacs-4/packages/contacts/www/contact-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-edit.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/www/contact-edit.tcl	6 Jul 2005 23:40:25 -0000	1.9
+++ openacs-4/packages/contacts/www/contact-edit.tcl	15 Jul 2005 21:01:52 -0000	1.10
@@ -29,8 +29,7 @@
 set form_elements {party_id:key}
 lappend form_elements {object_type:text(hidden)}
 
-
-set ams_forms [list "${package_id}__-2"]
+set ams_forms [list "${package_id}__[contacts::default_group]"]
 foreach group [contact::groups -expand "all" -privilege_required "read"] {
     set group_id [lindex $group 1]
     if { [lsearch $groups_belonging_to $group_id] >= 0 } {
Index: openacs-4/packages/contacts/www/contact-rels-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/www/contact-rels-postgresql.xql	19 Jun 2005 09:07:04 -0000	1.4
+++ openacs-4/packages/contacts/www/contact-rels-postgresql.xql	15 Jul 2005 21:01:52 -0000	1.5
@@ -54,7 +54,7 @@
        ( select name from organizations where organization_id = party_id ) as organization
   from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ) , group_distinct_member_map
  where parties.party_id = group_distinct_member_map.member_id
-   and group_distinct_member_map.group_id = '-2'
+   and group_distinct_member_map.group_id = '[contacts::default_group]'
  $type_clause
  [contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"]
  order by upper(contact__name(parties.party_id))
Index: openacs-4/packages/contacts/www/contact-rels.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/contacts/www/contact-rels.tcl	15 Jul 2005 01:39:42 -0000	1.14
+++ openacs-4/packages/contacts/www/contact-rels.tcl	15 Jul 2005 21:01:52 -0000	1.15
@@ -94,8 +94,7 @@
 set context {}
 set package_url [ad_conn package_url]
 
-if { [exists_and_not_null query] && [exists_and_not_null row_two] } {
-
+if { [exists_and_not_null query] && [exists_and_not_null role_two] } {
     set primary_party $party_id
     
     template::list::create \
Index: openacs-4/packages/contacts/www/contact.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/contacts/www/contact.tcl	28 Jun 2005 22:07:52 -0000	1.19
+++ openacs-4/packages/contacts/www/contact.tcl	15 Jul 2005 21:01:52 -0000	1.20
@@ -18,14 +18,15 @@
 
 set object_type [contact::type -party_id $party_id]
 set user_id [ad_conn user_id]
+set default_group [contacts::default_group]
 
 set package_url [ad_conn package_url]
 
 
 # Code for quickly adding an employee
 
 if {$object_type == "organization"} {
-    set employee_url [export_vars -base "/contacts/add/person" -url {{group_ids "-2"} {object_id_two "$party_id"} {rel_type "contact_rels_employment"}}]
+    set employee_url [export_vars -base "/contacts/add/person" -url {{group_ids $default_group} {object_id_two "$party_id"} {rel_type "contact_rels_employment"}}]
 } else {
     set employee_url ""
 }
Index: openacs-4/packages/contacts/www/group-parties-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-parties-remove.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/www/group-parties-remove.tcl	1 Jul 2005 22:46:44 -0000	1.6
+++ openacs-4/packages/contacts/www/group-parties-remove.tcl	15 Jul 2005 21:01:52 -0000	1.7
@@ -9,6 +9,7 @@
     {party_ids:optional}
     {return_url "./"}
     {group_id:integer,multiple,optional}
+    {confirmed_p "0"}
 } -validate {
     valid_party_submission {
 	if { ![exists_and_not_null party_id] && ![exists_and_not_null party_ids] } { 
@@ -24,43 +25,50 @@
 }
 
 if { [exists_and_not_null group_id] } {
-set group_ids $group_id
-db_transaction {
-    set message [list]
-    foreach group_id $group_ids {
-	set contacts [list]
-        foreach party_id $party_ids {
-            # relation_add verifies that they aren't already in the group
-	    set contact_name [contact::name -party_id $party_id] 
-	    if { $group_id != "-2" } {
-		lappend contacts "<a href=\"[contact::url -party_id $party_id]\">$contact_name</a>"
-	    } else {
-		lappend contacts $contact_name
+    if { $group_id != [contacts::default_group] || $confirmed_p } {
+
+	set group_ids $group_id
+	db_transaction {
+	    set message [list]
+	    foreach group_id $group_ids {
+		set contacts [list]
+		foreach party_id $party_ids {
+		    # relation_add verifies that they aren't already in the group
+		    set contact_name [contact::name -party_id $party_id] 
+		    if { $group_id != [contacts::default_group] } {
+			lappend contacts "<a href=\"[contact::url -party_id $party_id]\">$contact_name</a>"
+		    } else {
+			lappend contacts $contact_name
+		    }
+		    group::remove_member -group_id $group_id -user_id $party_id
+		}
+		set contact_count [llength $contacts]
+		set contacts [join $contacts ", "]
+		set contact $contacts
+		set group [lang::util::localize [group::get_element -group_id $group_id -element group_name]]
+		if { $group_id != [contacts::default_group] } {
+		    if { $contact_count > 1 } {
+			util_user_message -message [_ contacts.lt_contacts_were_removed_from_group]
+		    } else {
+			util_user_message -message [_ contacts.lt_contacts_was_removed_from_group]
+		    }
+		} else {
+		    if { $contact_count > 1 } {
+			util_user_message -message [_ contacts.lt_contacts_were_deleted]
+		    } else {
+			util_user_message -message [_ contacts.lt_contacts_was_deleted]
+		    }
+		}
 	    }
-            group::remove_member -group_id $group_id -user_id $party_id
-        }
-	set contact_count [llength $contacts]
-	set contacts [join $contacts ", "]
-	set contact $contacts
-	set group [lang::util::localize [group::get_element -group_id $group_id -element group_name]]
-	if { $group_id != "-2" } {
-	    if { $contact_count > 1 } {
-		util_user_message -message [_ contacts.lt_contacts_were_removed_from_group]
-	    } else {
-		util_user_message -message [_ contacts.lt_contacts_was_removed_from_group]
-	    }
-	} else {
-	    if { $contact_count > 1 } {
-		util_user_message -message [_ contacts.lt_contacts_were_deleted]
-	    } else {
-		util_user_message -message [_ contacts.lt_contacts_was_deleted]
-	    }
 	}
+	ad_returnredirect $return_url
+	ad_script_abort
+    } else {
+	set delete_url [export_vars -base group-parties-remove -url {party_id group_id party_ids {confirmed_p 1} return_url}]
+	set cancel_url $return_url
+	ad_return_template group-delete-confirm
     }
 }
-ad_returnredirect $return_url
-ad_script_abort
-}
 
 set title "[_ contacts.Remove_From_to_Group]"
 set user_id [ad_conn user_id]
Index: openacs-4/packages/contacts/www/search.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/search.xql	18 May 2005 16:45:50 -0000	1.1
+++ openacs-4/packages/contacts/www/search.xql	15 Jul 2005 21:01:52 -0000	1.2
@@ -34,7 +34,7 @@
                                 from contact_groups
                                where package_id = :package_id ) contact_groups on (groups.group_id = contact_groups.group_id)
      where groups.group_id != '-1'
-    order by CASE WHEN groups.group_id = '-2' THEN '000000000' ELSE upper(groups.group_name) END
+    order by CASE WHEN groups.group_id = '[contacts::default_group]' THEN '000000000' ELSE upper(groups.group_name) END
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/contacts/www/select-groups.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/select-groups.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/select-groups.tcl	28 Jun 2005 19:41:23 -0000	1.3
+++ openacs-4/packages/contacts/www/select-groups.tcl	15 Jul 2005 21:01:52 -0000	1.4
@@ -17,11 +17,11 @@
 set form_elements {
     object_type:text(hidden)
 }
-
+set default_group [contacts::default_group]
 set group_options [contact::groups -privilege_required "create"]
 if { [llength $group_options] == "0" } {
     # only the default group is available to this user
-    set group_ids "-2" 
+    set group_ids $default_group
     ad_returnredirect [export_vars -base "add/${object_type}" -url {object_type group_ids}]
 #    ad_return_error "[_ contacts.lt_Insufficient_Permissi]" "[_ contacts.lt_You_do_not_have_permi]"
 }
@@ -41,7 +41,7 @@
     } -on_submit {
     } -after_submit {
 	# the contact needs to be added to the default group
-	lappend group_ids "-2"
+	lappend group_ids $default_group
 	ad_returnredirect [export_vars -base "add/${object_type}" -url {object_type group_ids}]
 	ad_script_abort
     }
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 -r1.7 -r1.8
--- openacs-4/packages/contacts/www/admin/index.tcl	28 Jun 2005 19:23:41 -0000	1.7
+++ openacs-4/packages/contacts/www/admin/index.tcl	15 Jul 2005 21:01:52 -0000	1.8
@@ -115,19 +115,20 @@
 
 }
 
+set default_group [contacts::default_group]
 
     set ams_person_url [ams::list::url \
                           -package_key "contacts" \
                           -object_type "person" \
-                          -list_name "${package_id}__-2" \
-                          -pretty_name "${package_id}__-2" \
+                          -list_name "${package_id}__${default_group}" \
+                          -pretty_name "${package_id}__${default_group}" \
                           -return_url $return_url \
                           -return_url_label "[_ contacts.Return_to_title]"]
     set ams_org_url [ams::list::url \
                           -package_key "contacts" \
                           -object_type "organization" \
-                          -list_name "${package_id}__-2" \
-                          -pretty_name "${package_id}__-2" \
+                          -list_name "${package_id}__${default_group}" \
+                          -pretty_name "${package_id}__${default_group}" \
                           -return_url $return_url \
                           -return_url_label "[_ contacts.Return_to_title]"]