Index: openacs-4/contrib/packages/project-manager/www/add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit.tcl,v diff -u -r1.16.2.10 -r1.16.2.11 --- openacs-4/contrib/packages/project-manager/www/add-edit.tcl 4 May 2005 06:13:53 -0000 1.16.2.10 +++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl 12 May 2005 07:34:17 -0000 1.16.2.11 @@ -53,28 +53,16 @@ set ongoing_by_default_p [parameter::get -parameter "OngoingByDefaultP" -default "f"] +# In EDIT mode, the setting of the title and context_bar in the "-edit" section of the form +# does not work, so I set it here. Luckily this if overwritten for new projects :). +set title "[_ project-manager.lt_Edit_a_project_term_l]" +set context_bar [ad_context_bar "[_ project-manager.Edit_project_term]"] + if {[exists_and_not_null project_item_id] && ![exists_and_not_null project_id]} { set project_id [pm::project::get_project_id -project_item_id $project_item_id] } - -if {[exists_and_not_null project_id]} { - set title "[_ project-manager.lt_Edit_a_project_term_l]" - set context_bar [ad_context_bar "[_ project-manager.Edit_project_term]"] - - # permissions - permission::require_permission -party_id $user_id -object_id $project_id -privilege write - -} else { - set title "[_ project-manager.lt_Add_a_project_term_lo]" - set context_bar [ad_context_bar "[_ project-manager.New_project_term]"] - - # permissions - permission::require_permission -party_id $user_id -object_id $package_id -privilege create -} - - if {[ad_form_new_p -key project_item_id]} { set logger_project "" set logger_values "" @@ -205,6 +193,9 @@ } \ -new_request { + set title "[_ project-manager.lt_Add_a_project_term_lo]" + set context_bar [ad_context_bar "[_ project-manager.New_project_term]"] + if {[string equal $ongoing_by_default_p t]} { set ongoing_p t } @@ -220,6 +211,12 @@ } \ -new_data { + set title "[_ project-manager.lt_Add_a_project_term_lo]" + set context_bar [ad_context_bar "[_ project-manager.New_project_term]"] + + # permissions + permission::require_permission -party_id $user_id -object_id $package_id -privilege create + set project_id [pm::project::new \ -project_name $project_name \ -project_code $project_code \ @@ -270,6 +267,13 @@ } -edit_data { + + set title "[_ project-manager.lt_Edit_a_project_term_l]" + set context_bar [ad_context_bar "[_ project-manager.Edit_project_term]"] + + # permissions + permission::require_permission -party_id $user_id -object_id $project_id -privilege write + # we need to pass the old_project_id to add-edit-2.tcl because # the new revision will not have any of the custom values in # it until it is edited. So we need to pull in these values