Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-workflow
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-workflow
Commits
5cead720
Commit
5cead720
authored
Apr 05, 2024
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with persons.vacation_replacement_id: Was checked on im_employees before
parent
5eef8143
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
intranet-workflow-procs.tcl
tcl/intranet-workflow-procs.tcl
+9
-1
No files found.
tcl/intranet-workflow-procs.tcl
View file @
5cead720
...
...
@@ -1046,6 +1046,7 @@ ad_proc -public im_workflow_replacing_vacation_users {
}
# Check if the current user is replacing users during their vacations
# Fraber 2024-04-05: vacation_replacement_id on persons not im_employees, adding 2nd version below
if
{[
im_column_exists im_employees vacation_replacement_id
]}
{
set replacement_ids
[
concat
$replacement
_ids
[
db_list employee_replacement
"
select e.employee_id
...
...
@@ -1053,6 +1054,13 @@ ad_proc -public im_workflow_replacing_vacation_users {
where e.vacation_replacement_id = :current_user_id
"
]]
}
if
{[
im_column_exists persons vacation_replacement_id
]}
{
set replacement_ids
[
concat
$replacement
_ids
[
db_list person_replacement
"
select pe.person_id
from persons pe
where pe.vacation_replacement_id = :current_user_id
"
]]
}
return
$replacement
_ids
}
...
...
@@ -1533,7 +1541,7 @@ ad_proc -public im_workflow_home_inbox_component {
from (
$tasks
_sql) t
order by workflow_key || '.' || t.transition_key, workflow_name || ' - ' || transition_name
"
#
ad_return_complaint 1 [im_ad_hoc_query -format html $wf_action_sql
]
#
ad_return_complaint 1
[
im_ad_hoc_query -format html
$wf
_action_sql
]
set wf_action_options
[
db_list_of_lists wfa
$wf
_action_sql
]
set wf_action_options
[
linsert
$wf
_action_options 0
[
list
""
""
]]
set wf_action_select
[
im_select -translate_p 0 -ad_form_option_list_style_p 1 filter_wf_action
$wf
_action_options
$filter
_wf_action
]
...
...
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