Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.54 -r1.55
--- openacs-4/packages/contacts/contacts.info	25 Nov 2005 18:12:21 -0000	1.54
+++ openacs-4/packages/contacts/contacts.info	15 Dec 2005 18:38:14 -0000	1.55
@@ -5,7 +5,7 @@
     <package-name>Contacts</package-name>
     <pretty-plural>Contacts</pretty-plural>
     <initial-install-p>f</initial-install-p>
-    <singleton-p>f</singleton-p>
+    <singleton-p>t</singleton-p>
     
     <version name="1.1d9" url="http://openacs.org/repository/download/apm/contacts-1.1d9.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
@@ -24,14 +24,15 @@
 
         <callbacks>
             <callback type="after-install"  proc="contacts::install::package_install"/>
-            <callback type="after-instantiate"  proc="contacts::install::package_instantiate"/>
             <callback type="after-upgrade"  proc="contacts::install::package_upgrade"/>
+            <callback type="after-instantiate"  proc="contacts::install::package_instantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptableFileUploadMIMETypes"  default="*" description="* for any. CSV of acceptable MIME Types for File Upload" section_name="File Upload"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptablePhotoUploadMIMETypes"  default="image/jpeg,image/gif,image/png,image/bmp,image/tiff" description="CSV of acceptable MIME Types for Photo Upload" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AddEditComplaint"  default="/packages/contacts/templates/ae-complaint" description="The template for the display of the complaint form" section_name="Portal Templates"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllPeopleAreUsers"  default="0" description="1 if true, 0 if false. If set to 1 all newly created people will be users. If set to 0 you will be asked whether or not a user account should be created."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ChangePersonNameOrder"  default="0" description="Changes the default name of a person displayed from &quot;First_names Last_name&quot; to &quot;Last_name, First_names&quot;"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="Changes"  default="/packages/contacts/templates/changes" description="The template src for the changes portlet." section_name="Portal Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="Complaint"  default="/packages/contacts/templates/complaint" description="The template src for complaint page." section_name="Portal Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ComplaintAE"  default="/packages/contacts/templates/complaint-ae" description="The template source for complaint-ae." section_name="Portal Templates"/>
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.16 -r1.17
--- openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl	6 Dec 2005 19:30:11 -0000	1.16
+++ openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl	15 Dec 2005 18:38:15 -0000	1.17
@@ -836,8 +836,8 @@
               -object_type "organization" \
               -attribute_name "invoice_specialities" \
               -datatype "text" \
-              -pretty_name "Invoice Specialitieso" \
-              -pretty_plural "Invoice Specialities*" \
+              -pretty_name "Invoice Specialities" \
+              -pretty_plural "Invoice Specialities" \
               -table_name "" \
               -column_name "" \
               -default_value "" \
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.40 -r1.41
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	14 Dec 2005 17:28:19 -0000	1.40
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	15 Dec 2005 18:38:15 -0000	1.41
@@ -266,6 +266,9 @@
     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 "::contact::salutation_not_cached -party_id $party_id -type salutation"
+    util_memoize_flush "::contact::salutation_not_cached -party_id $party_id -type letter"
+    util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $party_id"
 }
 
 ad_proc -public contact::name {
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.5 -r1.6
--- openacs-4/packages/contacts/www/relationship-ae.tcl	9 Aug 2005 12:44:19 -0000	1.5
+++ openacs-4/packages/contacts/www/relationship-ae.tcl	15 Dec 2005 18:38:15 -0000	1.6
@@ -76,6 +76,9 @@
         db_dml insert_contact_rel {}
 	#	callback contact::insert_contact_rel -package_id $package_id -form party_ae -object_type $object_type
         util_user_message -message "[_ contacts.Relationship_Added]"
+
+	# flush cache for employee data
+	util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $object_id_one"
     } else {
         util_user_message -message "[_ contacts.Relationship_Updated]"
     }
Index: openacs-4/packages/contacts/www/relationship-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-delete-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/relationship-delete-postgresql.xql	21 May 2005 21:00:41 -0000	1.1
+++ openacs-4/packages/contacts/www/relationship-delete-postgresql.xql	15 Dec 2005 18:38:15 -0000	1.2
@@ -1,6 +1,15 @@
 <?xml version="1.0"?>
 <queryset>
 
+<fullquery name="get_object_id_one">
+      <querytext>
+select object_id_one
+  from acs_rels
+ where ( object_id_one = :party_id or object_id_two = :party_id )
+   and rel_id = :rel_id
+      </querytext>
+</fullquery>
+
 <fullquery name="delete_rel">
       <querytext>
 select acs_object__delete(rel_id)
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.4 -r1.5
--- openacs-4/packages/contacts/www/relationship-delete.tcl	16 Jun 2005 08:38:11 -0000	1.4
+++ openacs-4/packages/contacts/www/relationship-delete.tcl	15 Dec 2005 18:38:15 -0000	1.5
@@ -17,8 +17,12 @@
 }
 
 # ams::object_delete -object_id $rel_id
+db_1row get_object_id_one {}
 db_1row delete_rel {}
 
+# flush cache for employee data
+util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $object_id_one"
+
 if { ![exists_and_not_null return_url] } {
     set return_url "$party_id/relationships"
 }