Index: openacs-4/packages/contacts/lib/search-contact.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/search-contact.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/contacts/lib/search-contact.tcl 18 Dec 2005 12:30:20 -0000 1.1 +++ openacs-4/packages/contacts/lib/search-contact.tcl 18 Dec 2005 21:31:28 -0000 1.2 @@ -30,4 +30,4 @@ {return_url:text(hidden) {value $return_url}} } -on_submit { ad_returnredirect [export_vars -base "/contacts/" -url {{query $keyword}}] -} \ No newline at end of file +} -has_submit {1} \ No newline at end of file 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.47 -r1.48 --- openacs-4/packages/contacts/tcl/contacts-procs.tcl 18 Dec 2005 18:51:17 -0000 1.47 +++ openacs-4/packages/contacts/tcl/contacts-procs.tcl 18 Dec 2005 21:31:28 -0000 1.48 @@ -332,6 +332,8 @@ util_memoize_flush "::contact::mailing_address_exists_p_not_cached -party_id $party_id" util_memoize_flush "::contact::name_not_cached -party_id $party_id" util_memoize_flush "::contact::email_not_cached -party_id $party_id" + util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $party_id *" + util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $party_id" } ad_proc -public contact::name { @@ -638,7 +640,6 @@ # We check if the group has the required privilege # specified on privilege_required switch, if not then # we just simple continue with the next one - ns_log Notice "$group_id" if { ![permission::permission_p -object_id $group_id -party_id $user_id -privilege $privilege_required] } { continue } 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.14 -r1.15 --- openacs-4/packages/contacts/www/contact-edit.tcl 28 Oct 2005 21:17:02 -0000 1.14 +++ openacs-4/packages/contacts/www/contact-edit.tcl 18 Dec 2005 21:31:29 -0000 1.15 @@ -172,6 +172,10 @@ category::map_object -remove_old -object_id $party_id $cat_ids if {$object_type == "organization"} { callback contact::organization_new -package_id $package_id -contact_id $party_id -name $name + foreach employee_id [contact::util::get_employees -organization_id $party_id] { + util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $employee_id *" + util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $employee_id" + } } else { callback contact::person_add -package_id $package_id -person_id $party_id } Index: openacs-4/packages/contacts/www/relationship-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-add.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/contacts/www/relationship-add.tcl 4 Dec 2005 22:11:02 -0000 1.6 +++ openacs-4/packages/contacts/www/relationship-add.tcl 18 Dec 2005 21:31:29 -0000 1.7 @@ -42,10 +42,14 @@ set contact_type_one [contact::type -party_id $party_id] if { $contact_type_one == "user" } { set contact_type_one "person" + util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $party_id *" + util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $party_id" } set contact_type_two [contact::type -party_id $party_two] if { $contact_type_two == "user" } { set contact_type_two "person" + util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $party_two *" + util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $party_two" } set secondary_role_pretty [lang::util::localize [db_string get_secondary_role_pretty {}]] if { ![exists_and_not_null rel_type] } { Index: openacs-4/packages/contacts/www/relationship-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-ae.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/contacts/www/relationship-ae.tcl 15 Dec 2005 18:38:15 -0000 1.6 +++ openacs-4/packages/contacts/www/relationship-ae.tcl 18 Dec 2005 21:31:29 -0000 1.7 @@ -79,6 +79,7 @@ # flush cache for employee data util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $object_id_one" + util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $object_id_one *" } else { util_user_message -message "[_ contacts.Relationship_Updated]" } Index: openacs-4/packages/contacts/www/relationship-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-delete.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/contacts/www/relationship-delete.tcl 15 Dec 2005 18:38:15 -0000 1.5 +++ openacs-4/packages/contacts/www/relationship-delete.tcl 18 Dec 2005 21:31:29 -0000 1.6 @@ -22,7 +22,11 @@ # flush cache for employee data util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $object_id_one" +util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $object_id_one *" +util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $party_id" +util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $party_id *" + if { ![exists_and_not_null return_url] } { set return_url "$party_id/relationships" }