Index: openacs-4/packages/ams/www/attribute.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/attribute.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ams/www/attribute.tcl	15 Jun 2005 22:59:04 -0000	1.6
+++ openacs-4/packages/ams/www/attribute.tcl	9 Sep 2005 14:06:12 -0000	1.7
@@ -51,6 +51,9 @@
                 </else>
             }
         }
+	pretty_name {
+	    label "[_ ams.Pretty_Name]"
+	}
         sort_order {
             label "[_ ams.Sort_Order]"
             display_template {
@@ -78,6 +81,7 @@
             layout table
             row {
                 option {}
+		pretty_name {}
                 sort_order {}
                 actions {}
             }
@@ -88,10 +92,11 @@
 set sort_count 10
 set sort_key_count 10000
 db_multirow -extend { sort_order sort_key delete_url edit_url } options select_options {
-    select option_id, option,
+    select option_id, option, title as pretty_name,
            CASE WHEN ( select '1' from ams_options where ams_options.option_id = ams_option_types.option_id limit 1 ) IS NULL THEN 0 ELSE 1 END as in_use_p
-      from ams_option_types
+      from ams_option_types aot, acs_objects o
      where attribute_id = :attribute_id
+     and aot.option_id = o.object_id
      order by sort_order
 } {
     set sort_order $sort_count