Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-timesheet2-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-timesheet2-workflow
Commits
05e40fc0
Commit
05e40fc0
authored
May 15, 2008
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- fixed issue if the list timesheet_conf_object is pointing at a task
(and not at a project)
parent
a87cf3e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
1 deletion
+20
-1
new.tcl
www/conf-objects/new.tcl
+20
-1
No files found.
www/conf-objects/new.tcl
View file @
05e40fc0
...
@@ -39,6 +39,24 @@ if {![info exists message]} { set message "" }
...
@@ -39,6 +39,24 @@ if {![info exists message]} { set message "" }
# ---------------------------------------------------------------
# ---------------------------------------------------------------
set
conf_project_options
[
im_project_options
]
set
conf_project_options
[
im_project_options
]
if
{[
info
exists conf_id
]}
{
# Add the conf_item's project to the options, if not already there
# Otherwise the component can't show the project's name
set conf_project_id
[
db_string conf_pid
"select conf_project_id from im_timesheet_conf_objects where conf_id = :conf_id"
-default
""
]
set found_p 0
foreach ptuple
$conf
_project_options
{
set pname
[
lindex
$ptuple
0
]
set pid
[
lindex
$ptuple
1
]
if
{
$pid
==
$conf
_project_id
}
{
set found_p 1
}
}
if
{
!$found_p
}
{
set conf_project_name
[
db_string conf_pid
"select project_name from im_projects where project_id = :conf_project_id"
-default
""
]
lappend conf_project_options
[
list
$conf
_project_name
$conf
_project_id
]
}
}
set
conf_type_options
[
db_list_of_lists conf_type_options
"
set
conf_type_options
[
db_list_of_lists conf_type_options
"
select conf_type, conf_type_id
select conf_type, conf_type_id
from im_timesheet_conf_object_types
from im_timesheet_conf_object_types
...
@@ -95,7 +113,6 @@ if {"delete" == $button_pressed} {
...
@@ -95,7 +113,6 @@ if {"delete" == $button_pressed} {
ad_returnredirect
$return
_url
ad_returnredirect
$return
_url
}
}
# ---------------------------------------------------------------
# ---------------------------------------------------------------
# The Form
# The Form
# ---------------------------------------------------------------
# ---------------------------------------------------------------
...
@@ -120,9 +137,11 @@ ad_form \
...
@@ -120,9 +137,11 @@ ad_form \
ad_form -extend -name
$form
_id
\
ad_form -extend -name
$form
_id
\
-select_query
{
-select_query
{
select *
select *
from im_timesheet_conf_objects
from im_timesheet_conf_objects
where conf_id = :conf_id
where conf_id = :conf_id
}
-new_data
{
}
-new_data
{
db_exec_plsql create_conf
"
db_exec_plsql create_conf
"
SELECT im_conf__new(
SELECT im_conf__new(
...
...
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