Commit 998f1026 authored by adrtel's avatar adrtel

- Added parameter "include_disabled_p" to TaskStatusStore / CategoryStore

  in able to deal with ADR (and other...) configurations where the status
  "Open" has been disabled
parent 491a7a7d
...@@ -807,6 +807,15 @@ ad_proc -private im_rest_get_im_categories { ...@@ -807,6 +807,15 @@ ad_proc -private im_rest_get_im_categories {
} }
if {"" != $where_clause} { set where_clause "and $where_clause" } if {"" != $where_clause} { set where_clause "and $where_clause" }
# Include disabled categories? Default is false
set include_disabled_p 0
if {[info exists query_hash(include_disabled_p)]} {
set v $query_hash(include_disabled_p)
if {"1" eq $v} { set include_disabled_p 1}
}
set include_disabled_sql ""
if {$include_disabled_p} { set include_disabled_sql "OR 1=1" }
# Select SQL: Pull out categories. # Select SQL: Pull out categories.
set sql " set sql "
select c.category_id as rest_oid, select c.category_id as rest_oid,
...@@ -814,7 +823,7 @@ ad_proc -private im_rest_get_im_categories { ...@@ -814,7 +823,7 @@ ad_proc -private im_rest_get_im_categories {
im_category_path_to_category(c.category_id) as tree_sortkey, im_category_path_to_category(c.category_id) as tree_sortkey,
c.* c.*
from im_categories c from im_categories c
where (c.enabled_p is null OR c.enabled_p = 't') where (c.enabled_p is null OR c.enabled_p = 't' $include_disabled_sql)
$where_clause $where_clause
order by category_id order by category_id
" "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment