Index: openacs-4/packages/ams/www/attribute.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/attribute.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/ams/www/attribute.tcl 7 Apr 2006 07:57:42 -0000 1.11
+++ openacs-4/packages/ams/www/attribute.tcl 26 Apr 2006 08:40:20 -0000 1.12
@@ -36,7 +36,6 @@
set title $attribute_info(pretty_name)
set context [list [list objects Objects] [list "object?object_type=$attribute_info(object_type)" $object_info(pretty_name)] $title]
-
list::create \
-name options \
-multirow options \
@@ -61,16 +60,13 @@
label "[_ ams.Option]"
display_template {
- @options.option@
+ @options.pretty_name@
}
}
- pretty_name {
- label "[_ ams.Pretty_Name]"
- }
sort_order {
label "[_ ams.Sort_Order]"
display_template {
@@ -90,6 +86,7 @@
display_template {
+ | Purge
}
}
} -filters {
@@ -116,9 +113,9 @@
set sort_count 10
set sort_key_count 10000
-db_multirow -extend { sort_order sort_key delete_url edit_url default_p default_url } options select_options {
+db_multirow -extend { sort_order sort_key delete_url edit_url default_p purge_url default_url swa_p} options select_options {
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
+ (select '1' from ams_options where ams_options.option_id = ams_option_types.option_id limit 1 ) as in_use_p
from ams_option_types aot, acs_objects o
where attribute_id = :attribute_id
and aot.option_id = o.object_id
@@ -129,12 +126,14 @@
incr sort_count 10
incr sort_key_count 1
set delete_url [export_vars -base "attribute-option-delete" -url {attribute_id option_id}]
- set edit_url [lang::util::edit_lang_key_url -message $option]
+ set purge_url [export_vars -base "attribute-option-delete" -url {attribute_id option_id {purge_p 1}}]
+ set edit_url [lang::util::edit_lang_key_url -message $pretty_name]
if { $option_id eq $default_option_id } {
set default_p 1
} else {
set default_p 0
}
+ set swa_p [acs_user::site_wide_admin_p]
set default_url [export_vars -base "attribute" -url {attribute_id {set_default_option_id $option_id}}]
}