This node contains leaf (child) nodes. If you really want to delete those leaf nodes, plesae delete them first. Thank you."
Index: openacs-4/packages/categories/www/cadmin/category-delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-delete-oracle.xql 23 Apr 2003 12:29:27 -0000 1.1
+++ openacs-4/packages/categories/www/cadmin/category-delete-oracle.xql 14 Dec 2003 15:36:57 -0000 1.2
@@ -8,7 +8,7 @@
select case when count(*) = 0 then 0 else 1 end from dual
where exists (select 1 from category_object_map
- where category_id = :category_id)
+ where category_id = :id)
Index: openacs-4/packages/categories/www/cadmin/category-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-delete-postgresql.xql 23 Apr 2003 12:29:27 -0000 1.1
+++ openacs-4/packages/categories/www/cadmin/category-delete-postgresql.xql 14 Dec 2003 15:36:57 -0000 1.2
@@ -8,7 +8,7 @@
select case when count(*) = 0 then 0 else 1 end
where exists (select 1 from category_object_map
- where category_id = :category_id)
+ where category_id = :id)
Index: openacs-4/packages/categories/www/cadmin/category-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/category-delete.adp 22 May 2003 14:25:54 -0000 1.2
+++ openacs-4/packages/categories/www/cadmin/category-delete.adp 14 Dec 2003 15:36:57 -0000 1.3
@@ -3,11 +3,19 @@
+ Are you sure you want to delete these categories: +
+-
+
-
+ @categories.name@
+
(Still mapped to objects) +
+
+
+
-Index: openacs-4/packages/categories/www/cadmin/tree-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-form.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/tree-form.tcl 27 Apr 2003 11:37:12 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/tree-form.tcl 14 Dec 2003 15:36:58 -0000 1.3 @@ -12,55 +12,18 @@ page_title:onevalue } -set user_id [ad_maybe_redirect_for_registration] -set package_id [ad_conn package_id] +auth::require_login -if {[info exists tree_id]} { +if { ![ad_form_new_p -key tree_id] } { set page_title "Edit tree" } else { set page_title "Add tree" } -if {[info exists object_id]} { +if { [info exists object_id] } { set context_bar [list [category::get_object_context $object_id] [list "one-object?[export_url_vars locale object_id]" "Category Management"]] } else { set context_bar [list [list ".?[export_url_vars locale]" "Category Management"]] } lappend context_bar $page_title -set languages [db_list_of_lists get_ad_locales ""] - -ad_form -name tree_form -action tree-form -export { locale object_id } -form { - {tree_id:key} - {tree_name:text {label "Name"} {html {size 50 maxlength 50}}} - {language:text(select) {label "Language"} {value $locale} {options $languages}} - {description:text(textarea),optional {label "Description"} {html {rows 5 cols 80}}} -} -new_request { - permission::require_permission -object_id $package_id -privilege category_admin - set tree_name "" - set description "" -} -edit_request { - permission::require_permission -object_id $tree_id -privilege category_tree_write - set action Edit - util_unlist [category_tree::get_translation $tree_id $locale] tree_name description -} -on_submit { - set description [util_close_html_tags $description 4000] -} -new_data { - db_transaction { - category_tree::add -tree_id $tree_id -name $tree_name -description $description -locale $language -context_id $package_id - if { [info exists object_id] } { - category_tree::map -tree_id $tree_id -object_id $object_id - set return_url "one-object?[export_url_vars locale object_id]" - } else { - set return_url ".?[export_url_vars locale]" - } - } -} -edit_data { - category_tree::update -tree_id $tree_id -name $tree_name -description $description -locale $language - set return_url "tree-view?[export_url_vars tree_id locale object_id]" -} -after_submit { - ad_returnredirect $return_url - ad_script_abort -} - -ad_return_template Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/categories/www/cadmin/tree-form.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/categories/www/cadmin/tree-order-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-order-update.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/categories/www/cadmin/tree-order-update.tcl 14 Dec 2003 15:36:58 -0000 1.1 @@ -0,0 +1,80 @@ +ad_page_contract { + Update sort order + + @author Timo Hentschel (thentschel@sussdorff-roy.com) + @author Lars Pind (lars@collaboraid.biz) + @cvs-id $Id: +} { + tree_id:integer + sort_key:array + {locale ""} + object_id:integer,optional +} + +permission::require_permission -object_id $tree_id -privilege category_tree_write + +array set tree [category_tree::get_data $tree_id $locale] + +db_transaction { + + set count 0 + db_foreach get_tree "" { + incr count 10 + if {[empty_string_p $parent_id]} { + # need this as an anchor for toplevel categories + set parent_id -1 + } + if {[info exists sort_key($category_id)]} { + lappend child($parent_id) [list $sort_key($category_id) $category_id 0 0] + } else { + lappend child($parent_id) [list $count $category_id 0 0] + } + } + set last_ind [expr ($count / 5) + 1] + + set count 1 + set stack [list] + set done_list [list] + # put toplevel categories on stack + if {[info exists child(-1)]} { + set stack [lsort -integer -index 0 $child(-1)] + } + + while {[llength $stack] > 0} { + set next [lindex $stack 0] + set act_category [lindex $next 1] + set stack [lrange $stack 1 end] + if {[lindex $next 2]>0} { + ## the children of this parent are done, so this category is also done + lappend done_list [list $act_category [lindex $next 2] $count] + } elseif {[info exists child($act_category)]} { + ## put category and all children back on stack + set next [lreplace $next 2 2 $count] + set stack [linsert $stack 0 $next] + set stack [concat [lsort -integer -index 0 $child($act_category)] $stack] + } else { + ## this category has no children, so it is done + lappend done_list [list $act_category $count [expr $count + 1]] + incr count 1 + } + incr count 1 + } + + if {$count == $last_ind} { + # we do this so that there is no conflict in the old left_inds and the new ones + db_dml reset_category_index "" + + foreach category $done_list { + util_unlist $category category_id left_ind right_ind + db_dml update_category_index "" + } + } + category_tree::flush_cache $tree_id +} + +if {$count != $last_ind} { + ad_return_complaint 1 "Error during update: $done_list" + return +} +ad_returnredirect "tree-view?[export_url_vars tree_id locale object_id]" + Index: openacs-4/packages/categories/www/cadmin/tree-order-update.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-order-update.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/categories/www/cadmin/tree-order-update.xql 14 Dec 2003 15:36:58 -0000 1.1 @@ -0,0 +1,40 @@ + ++
-
| Tree Name | @tree_name@ |
|---|---|
| Description | @tree_description@ |
-
-
-
- Manage permissions
-
-
- Edit tree name and description
-
-
- Add node at top level
-
-
- Copy an existing tree
-
-
- Delete this tree
-
-
- Show modules using this tree
-
-
+ }
+ link_url_col edit_url
+ }
+}
+
+lappend elements category_name {
+ label "Category"
+ display_template {
+ @one_tree.left_indent;noquote@@one_tree.category_name@
+ 
+ }
+ link_url_col add_child_url
+ link_html { title "Add subcategory" }
+ }
+ lappend elements sort_key {
+ label "Ordering"
+ display_template {
+
+ }
+ }
+ lappend elements actions {
+ label "Actions"
+ display_template {
+ 
+ }
+ link_url_col delete_url
+ link_html { title "Delete category and all subcategories" }
+ }
+}
+
+set actions [list]
+set bulk_actions [list]
+if { $can_write_p } {
+ set bulk_actions {
+ "Delete" "category-delete" "Delete checked categories"
+ "Deprecate" "category-phase-out" "Deprecate checked categories"
+ "Restore" "category-phase-in" "Restore checked categories"
+ "Update ordering" "tree-order-update" "Update ordering from values in list"
+ }
+ set actions [list \
+ "Add root category" [export_vars -base category-form { tree_id locale object_id }] "Add category at the root level" \
+ "Copy tree" [export_vars -base tree-copy { tree_id locale object_id }] "Copy categories from other tree" \
+ "Delete tree" [export_vars -base tree-delete { tree_id locale object_id }] "Delete this category tree" \
+ "Applications" [export_vars -base tree-usage { tree_id locale object_id }] "Applications using this tree"]
+
+ if { $can_grant_p } {
+ lappend actions "Permissions" [export_vars -base permission-manage { tree_id locale object_id }] "Manage permissions for tree"
+ }
+
+}
+
+template::list::create \
+ -name one_tree \
+ -elements $elements \
+ -key category_id \
+ -actions $actions \
+ -bulk_actions $bulk_actions \
+ -bulk_action_export_vars { tree_id locale object_id }
\ No newline at end of file