Commit 1efda491 authored by Frank Bergmann's avatar Frank Bergmann

- updated version information

parent bc11cb6a
......@@ -9,7 +9,7 @@
<singleton-p>t</singleton-p>
<auto-mount>intranet-helpdesk</auto-mount>
<version name="3.5.0.0.0" url="http://www.project-open.org/download/apm/intranet-helpdesk-3.5.0.0.0.apm">
<version name="3.5.0.0.1" url="http://www.project-open.org/download/apm/intranet-helpdesk-3.5.0.0.1.apm">
<owner url="mailto:frank.bergmann@project-open.com">Frank Bergmann</owner>
<summary>Helpdesk Management</summary>
<vendor url="http://www.project-open.com/">]project-open[</vendor>
......
......@@ -48,10 +48,14 @@ set sql "
c.category_id,
c.category,
c.category_description,
p.parent_id
c.aux_string1 as workflow_name_specified,
p.parent_id,
w.workflow_key,
w.workflow_key as workflow_name
from
im_categories c
LEFT OUTER JOIN (select * from im_category_hierarchy) p ON p.child_id = c.category_id
LEFT OUTER JOIN wf_workflows w ON (c.aux_string1 = w.workflow_key)
where
c.category_type = 'Intranet Ticket Type' and
(c.enabled_p is null or c.enabled_p = 't') and
......@@ -82,6 +86,15 @@ db_foreach cats $sql {
if {"" == $comment} { set comment " " }
set comment [lang::message::lookup "" intranet-core.$category_comment_key $comment]
# Check if the WF actually exists
if {$workflow_name != $workflow_name_specified} {
set workflow_name "<font color=red>Invalid WF: $workflow_name_specified</font>"
} else {
if {[im_is_user_site_wide_or_intranet_admin $current_user_id]} {
set workflow_name "<a href=[export_vars -base "/acs-workflow/admin/workflow" {workflow_key}]>$workflow_name</a>"
}
}
append category_select_html "
<tr>
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
......@@ -92,6 +105,7 @@ db_foreach cats $sql {
</nobr>
</td>
<td>$comment</td>
<td>$workflow_name</td>
</tr>
"
......
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