Index: openacs-4/packages/tasks/www/processes.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/processes.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/tasks/www/processes.tcl 27 Jul 2005 13:45:00 -0000 1.1 +++ openacs-4/packages/tasks/www/processes.tcl 25 Sep 2005 23:49:23 -0000 1.2 @@ -21,23 +21,13 @@ write_p:onevalue create_p:onevalue admin_p:onevalue - task_term:onevalue - task_term_lower:onevalue - project_term:onevalue - project_term_lower:onevalue } if { [exists_and_not_null assignee_id] } { set cancel_url [export_vars -base "/tasks/contact" -url {{party_id $assignee_id}}] } # --------------------------------------------------------------- # -# terminology -set task_term [parameter::get -parameter "TaskName" -default "Task"] -set task_term_lower [parameter::get -parameter "taskname" -default "task"] -set project_term [parameter::get -parameter "ProjectName" -default "Project"] -set project_term_lower [parameter::get -parameter "projectname" -default "project"] - # set up context bar set context_bar [list "Processes"] @@ -52,31 +42,25 @@ set create_p [permission::permission_p -object_id $package_id -privilege create] set admin_p [permission::permission_p -object_id $package_id -privilege admin] -# root CR folder -# set root_folder [db_string get_root "select pm_project__get_root_folder (:package_id, 'f')"] +set title "Manage Processes" +set context [list $title] +set actions [list "Add Process" [export_vars -base process-add-edit {assignee_id}] "Add a Process"] +if {[exists_and_not_null assignee_id]} { + lappend actions "Cancel" "$cancel_url" "Cancel" +} -# Processes, using list-builder --------------------------------- -if { [exists_and_not_null assignee_id] } { - set mode "assign" - set title "Assing Process" - set content [list $title] -# set actions [list "Manage Processes" "processes" "Manage Processes"] - set actions "" + +if {$admin_p} { + set mode admin } else { - set mode "manage" - set title "Manage Processes" - set context [list $title] - set actions [list "Add Process" "process-add-edit" "Add a Process"] + set mode normal } -set elements "" - - - template::list::create \ -name processes \ -multirow processes \ -key item_id \ + -pass_properties { admin_p } \ -selected_format $mode \ -elements { assign { @@ -85,12 +69,12 @@ Assign } } - one_line { - label "Subject" + title { + label "Title" display_template { - - @processes.one_line@ - + + @processes.title@ + } } description { @@ -102,9 +86,9 @@ @processes.instances@ } } - owner_name { + creator_name { label "Manager" - link_url_eval $owner_url + link_url_eval $creator_url } edit { display_template { @@ -121,54 +105,47 @@ orderby_process {} } \ -orderby { - one_line {orderby one_line} - default_value one_line,desc + title {orderby title} + default_value title,desc } \ -orderby_name orderby_project \ -sub_class { narrow - } \ - -html { - width 100% } -formats { - assign { + normal { label "Assign Layout" layout table row { assign {} - one_line {} + title {} description {} - owner_name {} + creator_name {} } } - manage { - label "Assign Layout" + admin { + label "Admin Layout" layout table row { - edit {} - one_line {} + assign {} + title {} description {} - owner_name {} + creator_name {} instances {} + edit {} delete {} } } } -set mode_carryover $mode -db_multirow -extend { delete_url creation_date owner_url process_url assign_url mode } processes process_query { +db_multirow -extend { delete_url creation_date creator_url process_url assign_url} processes process_query { } { - set mode $mode_carryover - set delete_url [export_vars -base "process-delete" {process_id}] + set delete_url [export_vars -base "process-delete" {process_id assignee_id}] set creation_date [lc_time_fmt $creation_date_ansi "%x"] - set owner_url [acs_community_member_url -user_id $party_id] - set process_url [export_vars -base process -url {process_id}] + set creator_url [acs_community_member_url -user_id $creation_user] + set process_url [export_vars -base process -url {process_id assignee_id}] if { [exists_and_not_null assignee_id] } { set assign_url [export_vars -base process-assign -url {assignee_id process_id}] } else { set assign_url $process_url } } - - -# ------------------------- END OF FILE ------------------------- #