Skip to content

I
intranet-workflow
Commit 4d09a5ac authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Gustaf changes

parent 8bca2c72
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 63 deletions
tcl/intranet-workflow-procs.tcl
View file @ 4d09a5ac
......@@ -190,7 +190,7 @@ ad_proc -public im_workflow_status_select {
set value [lindex $option 0]
set key [lindex $option 1]
set selected ""
if {[string equal $default $key]} { set selected "selected" }
if {$default eq $key} { set selected "selected" }
append result "<option value=\"$key\" $selected>$value</option>\n"
}
append result "</select>\n"
......@@ -223,7 +223,7 @@ ad_proc -public im_workflow_home_component {
Creates a HTML table showing all currently active tasks
} {
set user_id [ad_conn user_id]
set admin_p [ad_permission_p [ad_conn package_id] "admin"]
set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege "admin"]
set template_file "packages/acs-workflow/www/task-list"
set template_path [get_server_root]/$template_file
......@@ -310,8 +310,8 @@ ad_proc -public im_workflow_graph_sort_order {
set from [lindex $edge 0]
set to [lindex $edge 1]
# Check if we find and outgoing edge from node
if {[string equal $from $active_node]} {
set dist1 [expr $distance($from) + 1]
if {$from eq $active_node} {
set dist1 [expr {$distance($from) + 1}]
if {$dist1 < $distance($to)} {
set distance($to) $dist1
ns_log Notice "im_workflow_graph_sort_order: distance($to) = $dist1"
......@@ -407,7 +407,7 @@ ad_proc -public im_workflow_graph_component {
set cnt 0
db_foreach history $history_sql {
append history_html "
<tr $bgcolor([expr $cnt % 2])>
<tr $bgcolor([expr {$cnt % 2}])>
<td>$transition_name</td>
<td><nobr><a href=/intranet/users/view?user_id=$holding_user>$holding_user_name</a></nobr></td>
<td><nobr>$started_date_pretty</nobr></td>
......@@ -457,19 +457,19 @@ ad_proc -public im_workflow_graph_component {
append transition_html "<tr class=rowtitle><td colspan=2 class=rowtitle align=center>
[lang::message::lookup "" intranet-workflow.Next_step_details "Next Step: Details"]
</td></tr>\n"
append transition_html "<tr $bgcolor([expr $cnt % 2])><td>
append transition_html "<tr $bgcolor([expr {$cnt % 2}])><td>
[lang::message::lookup "" intranet-workflow.Task_name "Task Name"]
</td><td>$transition_name</td></tr>\n"
incr cnt
append transition_html "<tr $bgcolor([expr $cnt % 2])><td>
append transition_html "<tr $bgcolor([expr {$cnt % 2}])><td>
[lang::message::lookup "" intranet-workflow.Holding_user "Holding User"]
</td><td>$holding_user_name</td></tr>\n"
incr cnt
append transition_html "<tr $bgcolor([expr $cnt % 2])><td>
append transition_html "<tr $bgcolor([expr {$cnt % 2}])><td>
[lang::message::lookup "" intranet-workflow.Task_state "Task State"]
</td><td>$state</td></tr>\n"
incr cnt
append transition_html "<tr $bgcolor([expr $cnt % 2])><td>
append transition_html "<tr $bgcolor([expr {$cnt % 2}])><td>
[lang::message::lookup "" intranet-workflow.Automatic_trigger "Automatic Trigger"]
</td><td>$trigger_time_pretty</td></tr>\n"
incr cnt
......@@ -518,7 +518,7 @@ ad_proc -public im_workflow_graph_component {
set party_link "<a href=/intranet/users/view?user_id=$party_id>$party_name</a>"
if {"user" != $party_type} { set party_link $party_name }
append assignee_html "
<tr $bgcolor([expr $cnt % 2])>
<tr $bgcolor([expr {$cnt % 2}])>
<td>$transition_name</td>
<td><nobr>$party_link</nobr></td>
</tr>
......@@ -527,7 +527,7 @@ ad_proc -public im_workflow_graph_component {
}
if {0 == $cnt} {
append assignee_html "
<tr $bgcolor([expr $cnt % 2])>
<tr $bgcolor([expr {$cnt % 2}])>
<td colspan=2><i>&nbsp;Nobody assigned</i></td>
</tr>
"
......@@ -633,10 +633,10 @@ ad_proc -public im_workflow_action_component {
return
}
set task(add_assignee_url) "/[im_workflow_url]/assignee-add?[export_vars -url {task_id}]"
set task(assign_yourself_url) "/[im_workflow_url]/assign-yourself?[export_vars -url {task_id return_url}]"
set task(manage_assignments_url) "/[im_workflow_url]/task-assignees?[export_vars -url {task_id return_url}]"
set task(cancel_url) "/[im_workflow_url]/task?[export_vars -url {task_id return_url {action.cancel Cancel}}]"
set task(add_assignee_url) "/[im_workflow_url]/[export_vars -base assignee-add {task_id}]"
set task(assign_yourself_url) "/[im_workflow_url]/[export_vars -base assign-yourself {task_id return_url}]"
set task(manage_assignments_url) "/[im_workflow_url]/[export_vars -base task-assignees {task_id return_url}]"
set task(cancel_url) "/[im_workflow_url]/[export_vars -base task {task_id return_url {action.cancel Cancel}}]"
set task(action_url) "/[im_workflow_url]/task"
set task(return_url) $return_url
......@@ -692,7 +692,7 @@ ad_proc -public im_workflow_action_component {
<form action='/[im_workflow_url]/task' method='post'>
$export_vars
<table>
<tr $bgcolor([expr $ctr%2])>
<tr $bgcolor([expr {$ctr%2}])>
<td>Task Name</td>
<td>$task(task_name)</td>
</tr>
......@@ -701,7 +701,7 @@ ad_proc -public im_workflow_action_component {
if {"" != [string trim $task(instructions)]} {
append result "
<tr $bgcolor([expr $ctr%2])>
<tr $bgcolor([expr {$ctr%2}])>
<td>Task Description</td>
<td>$task(instructions)</td>
</tr>
......@@ -732,7 +732,7 @@ ad_proc -public im_workflow_action_component {
"
} else {
append result "
<tr $bgcolor([expr $ctr%2])>
<tr $bgcolor([expr {$ctr%2}])>
<td>Action</td>
<td>
This task has been assigned to somebody else.<br>
......@@ -832,7 +832,7 @@ append result "This task was completed by <a href='/shared/community-member?user
if {"" != $task(hold_timeout_pretty)} {
set timeout_html "<td>Timeout</td><td>$task(hold_timeout_pretty)</td>\n"
append result "
<tr $bgcolor([expr $ctr%2])>
<tr $bgcolor([expr {$ctr%2}])>
$timeout_html
</tr>
"
......@@ -848,7 +848,7 @@ append result "This task was completed by <a href='/shared/community-member?user
set deadline_html "<td>Deadline</td><td>Deadline is $task(deadline_pretty)</td>\n"
}
append result "
<tr $bgcolor([expr $ctr%2])>
<tr $bgcolor([expr {$ctr%2}])>
$deadline_html
</tr>
"
......@@ -866,7 +866,7 @@ append result "This task was completed by <a href='/shared/community-member?user
}
if {[llength $assigned_users] > 0} {
append result "
<tr $bgcolor([expr $ctr%2])>
<tr $bgcolor([expr {$ctr%2}])>
<td>Assigned Users</td>
<td>[join $assigned_users "<br>\n"]</td>
</tr>
......@@ -885,7 +885,7 @@ append result "This task was completed by <a href='/shared/community-member?user
if {[llength $task_actions] > 0} {
append result "
<tr $bgcolor([expr $ctr%2])>
<tr $bgcolor([expr {$ctr%2}])>
<td>Extreme Actions</td>
<td>[join $task_actions "&nbsp; \n"]</td>
</tr>
......@@ -1124,7 +1124,7 @@ ad_proc -public im_workflow_home_inbox_component {
set value [ns_set get $form_vars $key]
append current_url "$key=[ns_urlencode $value]"
ns_log Notice "im_workflow_home_inbox_component: i=$i, key=$key, value=$value"
if { $i < [expr $form_vars_size-1] } { append url_vars "&" }
if { $i < [expr {$form_vars_size-1}] } { append url_vars "&" }
}
if {"" == $order_by_clause} {
......@@ -1270,7 +1270,7 @@ ad_proc -public im_workflow_home_inbox_component {
set rel "none"
if {[lsearch $replacement_ids $owner_id] > -1} { set rel "my_object" }
foreach assigned_user_id $assigned_users {
if {[lsearch $replacement_ids $assigned_user_id] > -1 && $rel != "holding_user"} {
if {[lsearch $replacement_ids $assigned_user_id] > -1 && $rel ne "holding_user"} {
set rel "assignment_group"
}
if {[lsearch $replacement_ids $holding_user] > -1} {
......@@ -1300,7 +1300,7 @@ ad_proc -public im_workflow_home_inbox_component {
# L10ned version of the relationship of the user to the object
set relationship_l10n [lang::message::lookup "" intranet-workflow.$rel $rel]
set row_html "<tr$bgcolor([expr $ctr % 2])>\n"
set row_html "<tr$bgcolor([expr {$ctr % 2}])>\n"
foreach column_var $column_vars {
append row_html "\t<td valign=top>"
set cmd "append row_html $column_var"
......@@ -1313,7 +1313,7 @@ ad_proc -public im_workflow_home_inbox_component {
}
# Show a reasonable message when there are no result rows:
if { [empty_string_p $table_body_html] } {
if { $table_body_html eq "" } {
set table_body_html "
<tr><td colspan=$colspan><ul><li><b>
[lang::message::lookup "" intranet-core.lt_There_are_currently_n "There are currently no entries matching the selected criteria"]
......@@ -1432,7 +1432,7 @@ ad_proc im_workflow_object_permissions {
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
set user_is_hr_p [im_user_is_hr_p $user_id]
set user_is_accounting_p [im_user_is_accounting_p $user_id]
set user_is_owner_p [expr $owner_id == $user_id]
set user_is_owner_p [expr {$owner_id == $user_id}]
set user_is_assignee_p [db_string assignee_p "
select count(*)
from (select pamm.member_id
......
www/flatten_wf.tcl
View file @ 4d09a5ac
......@@ -63,9 +63,9 @@ while {$cnt < 20 && [llength $active_nodes] > 0} {
# append html "<li>active=$active_node, from=$from, to=$to\n"
# Check if we find and outgoing edge from node
if {[string equal $from $active_node]} {
if {$from eq $active_node} {
set dist1 [expr $distance($from) + 1]
set dist1 [expr {$distance($from) + 1}]
# append html "<li>match: dist1=$dist1\n"
if {$dist1 < $distance($to)} {
......
www/inbox-action.tcl
View file @ 4d09a5ac
......@@ -10,7 +10,7 @@ ad_page_contract {
return_url
}
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
set user_is_admin_p [im_is_user_site_wide_or_intranet_admin $current_user_id]
if {![info exists action]} { set action [list] }
......
www/index.adp
View file @ 4d09a5ac
<master src="../../intranet-core/www/master">
<property name="title">@page_title@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="main_navbar_label">workflow</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<!-- left - right - bottom design -->
<table cellpadding=0 cellspacing=0 border=0 width="100%">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td colspan=3>
<td colspan="3">
<%= [im_component_bay top] %>
</td>
</tr>
......@@ -57,9 +57,9 @@
<if @admin_html@ ne "">
<table border=0 cellpadding=1 cellspacing=2>
<table border="0" cellpadding="1" cellspacing="2">
<tr>
<td class=rowtitle align=center>
<td class=rowtitle align="center">
#intranet-workflow.Admin_workflows#
</td>
</tr>
......@@ -78,7 +78,7 @@
</td>
</tr>
<tr>
<td colspan=3>
<td colspan="3">
@workflow_home_inbox;noquote@
<!-- @workflow_home_component;noquote@ -->
......
www/index.tcl
View file @ 4d09a5ac
......@@ -8,7 +8,7 @@ ad_page_contract {
}
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set page_title [lang::message::lookup "" intranet-workflow.Workflow_Home "Workflow Home"]
set workflow_home_inbox [im_workflow_home_inbox_component -relationship "assignment_group"]
set workflow_home_component [im_workflow_home_component]
......@@ -47,7 +47,7 @@ foreach type [db_list wf_notifs "select short_name from notification_types where
-object_id $notification_object_id \
-user_id $user_id]
set subscribed_p [expr ![empty_string_p $request_id]]
set subscribed_p [expr {$request_id ne ""}]
if { $subscribed_p } {
set url [notification::display::unsubscribe_url -request_id $request_id -url $return_url]
......@@ -61,7 +61,7 @@ foreach type [db_list wf_notifs "select short_name from notification_types where
set url $notification_subscribe_url
}
if { ![empty_string_p $url] } {
if { $url ne "" } {
multirow append notifications \
$url \
[string totitle $pretty_name] \
......
www/new-workflow.tcl
View file @ 4d09a5ac
......@@ -28,7 +28,7 @@ ad_page_contract {
# arbitrary object? We may argue yes, because security is dealt
# with on a per-workflow base.
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set page_title "[lang::message::lookup "" intranet-workflow.New_Workflow "New Workflow"]"
set context_bar [im_context_bar $page_title]
set page_focus "im_header_form.keywords"
......
www/reset-case-2.adp
View file @ 4d09a5ac
<master>
<property name="title">@page_title@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="main_navbar_label">rfc</property>
<if @button_cancel@ ne "">
......@@ -15,5 +15,5 @@
<p>&nbsp;</p>
<ul>
<li><a href="@return_url;noquote@"><%= [lang::message::lookup "" intranet-workflow.Back_to_last_page "Back to last page"] %></a>.
<li><a href="@return_url@"><%= [lang::message::lookup "" intranet-workflow.Back_to_last_page "Back to last page"] %></a>.
</ul>
www/reset-case-2.tcl
View file @ 4d09a5ac
......@@ -23,7 +23,7 @@ ad_page_contract {
# Defaults & Security
# ---------------------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set page_title "RFC l&ouml;schen"
set date_format "YYYY-MM-DD"
......
www/reset-case.adp
View file @ 4d09a5ac
<master>
<property name="title">@page_title@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="main_navbar_label">rfc</property>
<h1><%= [lang::message::lookup "" intranet-workflow.Confirm_reset_action "Confirm %action_pretty%"] %></h1>
......@@ -9,6 +9,6 @@
<form action=reset-case-2 method=POST>
<%= [export_vars -form {return_url project_id task_id place_key action_pretty}] %>
<input type=submit name=button_cancel value="<%= [lang::message::lookup "" intranet-workflow.Cancel_Button "Cancel"] %>">
<input type=submit name=button_confirm value="<%= [lang::message::lookup "" intranet-workflow.Confirm_Button "Confirm %action_pretty%"] %>">
<input type="submit" name="button_cancel" value="<%= [lang::message::lookup "" intranet-workflow.Cancel_Button "Cancel"] %>">
<input type="submit" name="button_confirm" value="<%= [lang::message::lookup "" intranet-workflow.Confirm_Button "Confirm %action_pretty%"] %>">
</form>
www/reset-case.tcl
View file @ 4d09a5ac
......@@ -21,7 +21,7 @@ ad_page_contract {
# Defaults & Security
# ---------------------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set page_title "RFC $action_pretty"
set date_format "YYYY-MM-DD"
......
www/task-cancel.tcl
View file @ 4d09a5ac
......@@ -8,7 +8,7 @@ ad_page_contract {
return_url
}
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set reassign_perms_p [im_permission $user_id "wf_reassign_tasks"]
set user_name [db_string uname "select im_name_from_user_id(:user_id)"]
......
www/workflow-gif.tcl
View file @ 4d09a5ac
......@@ -8,7 +8,7 @@ ad_page_contract {
tmpfile:notnull
} -validate {
tmpfile_valid -requires { tmpfile:notnull } {
if { ![string equal $tmpfile [ad_get_client_property wf wf_net_tmpfile]] } {
if { $tmpfile ne [ad_get_client_property wf wf_net_tmpfile] } {
ad_complain "Bad tmpfile argument"
}
}
......
www/workflow-graph.tcl
View file @ 4d09a5ac
......@@ -38,14 +38,14 @@ if { [wf_graphviz_installed_p] } {
set width_and_height ""
if { ![catch { set image_size [ns_gifsize $tmpfile] } error] } {
if { ![empty_string_p $image_size] } {
if { $image_size ne "" } {
set width_and_height "width=[lindex $image_size 0] height=[lindex $image_size 1]"
}
}
ad_set_client_property wf wf_net_tmpfile $tmpfile
set workflow_img_tag "<img src=\"/intranet-workflow/workflow-gif?[export_vars -url { tmpfile}]\" border=0 $width_and_height alt=\"Graphical representation of the process network\">"
set workflow_img_tag "<img src=\"/intranet-workflow/[export_vars -base workflow-gif { tmpfile}]\" border=0 $width_and_height alt=\"Graphical representation of the process network\">"
} else {
set workflow_img_tag ""
}
......
www/workflow.adp
View file @ 4d09a5ac
<master>
<property name="title">@workflow.pretty_name;noquote@</property>
<property name="context">@context;noquote@</property>
<property name="doc(title)">@workflow.pretty_name;literal@</property>
<property name="context">@context;literal@</property>
<!-- Tab bar -->
......
www/workflow.tcl
View file @ 4d09a5ac
......@@ -27,7 +27,7 @@ ad_page_contract {
}
}
set return_url "[ns_conn url]?[export_vars -url {workflow_key tab}]"
set return_url "[ns_conn url]?[export_vars {workflow_key tab}]"
db_1row workflow {
select w.workflow_key,
......@@ -72,18 +72,18 @@ set context [list "$workflow(pretty_name)"]
if { $workflow(num_cases) > 0 } {
#set edit_process_url ""
set edit_process_url "define?[export_vars -url {workflow_key}]"
set edit_process_url [export_vars -base define {workflow_key}]
set edit_attributes_url ""
set edit_roles_url "workflow-roles?[export_vars -url {workflow_key}]"
set copy_process_url "workflow-copy?[export_vars -url {workflow_key}]"
set edit_roles_url [export_vars -base workflow-roles {workflow_key}]
set copy_process_url [export_vars -base workflow-copy {workflow_key}]
} else {
set edit_process_url "define?[export_vars -url {workflow_key}]"
set edit_attributes_url "attributes?[export_vars -url {workflow_key}]"
set edit_roles_url "workflow-roles?[export_vars -url {workflow_key}]"
set copy_process_url "workflow-copy?[export_vars -url {workflow_key}]"
set edit_process_url [export_vars -base define {workflow_key}]
set edit_attributes_url [export_vars -base attributes {workflow_key}]
set edit_roles_url [export_vars -base workflow-roles {workflow_key}]
set copy_process_url [export_vars -base workflow-copy {workflow_key}]
}
set export_process_url "export?[export_vars -url {workflow_key}]"
set export_process_url [export_vars -base export {workflow_key}]
ad_return_template
......
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