Index: openacs-4/packages/contacts/www/bulk-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/bulk-update.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/bulk-update.tcl	15 Jun 2005 07:57:44 -0000	1.1
+++ openacs-4/packages/contacts/www/bulk-update.tcl	17 Jun 2005 19:32:03 -0000	1.2
@@ -90,18 +90,14 @@
     lappend form_elements 
 } else {
 
-set attribute_options [db_list_of_lists get_attributes "
-        select pretty_name,
-               attribute_id
-          from ams_attributes
-         where object_type in ([ams::object_parents -sql -object_type $object_type])
-           and widget in (select widget from ams_widgets where value_method in ( 'ams_value__time', 'ams_value__options'))
-         order by upper(pretty_name)
-"]
-set attribute_options [concat [list [list "" ""]] $attribute_options]
-lappend form_elements [list attribute_id:integer(select) [list label [_ contacts.Attribute]] [list options $attribute_options]]
-set edit_buttons [list [list "[_ contacts.Next]" next]]
+    set attribute_options [db_list_of_lists get_attributes {}]
+    set attribute_options [ams::util::localize_and_sort_list_of_lists -list $attribute_options]
 
+    set attribute_label [_ contacts.Attribute]
+    set attribute_options [concat [list [list "" ""]] $attribute_options]
+    lappend form_elements {attribute_id:integer(select) {label $attribute_label} {options $attribute_options}}
+    set edit_buttons [list [list "[_ contacts.Next]" next]]
+
 }