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.20 -r1.21 --- openacs-4/packages/contacts/www/contact-add.tcl 21 Jun 2005 21:26:05 -0000 1.20 +++ openacs-4/packages/contacts/www/contact-add.tcl 28 Jun 2005 19:44:51 -0000 1.21 @@ -18,10 +18,12 @@ } } -set group_list [contact::groups] - +set group_list [concat [list [list [_ contacts.All_Contacts] "-2" "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 } { + # 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]" } set path_info [ad_conn path_info] @@ -41,6 +43,7 @@ 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} { @@ -55,6 +58,7 @@ } set group_list [contact::groups -expand "all" -privilege_required "read"] +set group_list "{{All Contacts} -2 0} $group_list" ad_form -name party_ae \ @@ -304,6 +308,7 @@ util_user_message -html -message "The $object_type [contact::name -party_id $party_id] was added" } -after_submit { + contact::search::flush_results_counts #the formbutton does not work. No clue how to fix it. # if { [exists_and_not_null formbutton\:save_add_another] } { # ad_returnredirect [export_vars -base "/contacts/$object_type/add" -url] @@ -317,6 +322,8 @@ ad_script_abort } - - +if { $object_type == "person" && [parameter::get -boolean -parameter "AllPeopleAreUsers" -default "0"] } { + template::element set_properties party_ae create_user_p widget hidden + template::element set_value party_ae create_user_p "1" +} ad_return_template 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.6 -r1.7 --- openacs-4/packages/contacts/www/contact-edit.tcl 21 Jun 2005 23:18:33 -0000 1.6 +++ openacs-4/packages/contacts/www/contact-edit.tcl 28 Jun 2005 19:44:51 -0000 1.7 @@ -36,7 +36,7 @@ lappend form_elements {object_type:text(hidden)} -set ams_forms [list] +set ams_forms [list "${package_id}__-2"] foreach group [contact::groups -expand "all" -privilege_required "read"] { set group_id [lindex $group 1] if { [lsearch $groups_belonging_to $group_id] >= 0 } { @@ -102,7 +102,7 @@ } -on_submit { - # MGEDDERT: I NEED TO MAKE SURE THAT VALUES THAT NEED TO BE UNIQUE ARE UNIQUE + # WE NEED TO MAKE SURE THAT VALUES THAT NEED TO BE UNIQUE ARE UNIQUE # for orgs name needs to be unique # for all of them email needs to be unique @@ -156,6 +156,7 @@ } } -after_submit { + contact::search::flush_results_counts ad_returnredirect [contact::url -party_id $party_id] ad_script_abort }