Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-cost
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-cost
Commits
97e7725a
Commit
97e7725a
authored
Mar 25, 2021
by
Project Open
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Added fix from cosine to show status_id if it is the default even if it is disabled
parent
0a2f5234
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
intranet-cost-procs.tcl
tcl/intranet-cost-procs.tcl
+6
-3
No files found.
tcl/intranet-cost-procs.tcl
View file @
97e7725a
...
...
@@ -488,7 +488,10 @@ ad_proc -public im_cost_type_options { {include_empty 1} } {
return
$options
}
ad_proc -public im_cost_status_options
{
{
include_empty 1
}
}
{
ad_proc -public im_cost_status_options
{
{
-default 0
}
{
include_empty 1
}
}
{
Cost status options
}
{
set options
[
db_list_of_lists cost_status_options
"
...
...
@@ -496,7 +499,7 @@ ad_proc -public im_cost_status_options { {include_empty 1} } {
category_id
from im_categories
where category_type = 'Intranet Cost Status' and
(enabled_p is null OR 't' = enabled_p)
(enabled_p is null OR 't' = enabled_p
OR category_id = :default
)
order by
coalesce(sort_order, 0), category_id
"
]
...
...
@@ -2097,7 +2100,7 @@ ad_proc -public im_cost_status_select {
$default
with a list of all the cost status_types in the system
}
{
set include_empty 0
set options
[
util_memoize
[
list
im_cost_status_options
$include
_empty
]]
set options
[
util_memoize
[
list
im_cost_status_options
-default
$default
$include
_empty
]]
set result
"
\n
<select name=
\"
$select
_name
\"
>
\n
"
if
{
$default
eq
""
}
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment