Index: openacs-4/packages/project-manager/lib/projects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/project-manager/lib/projects.tcl 26 Aug 2005 23:30:50 -0000 1.17 +++ openacs-4/packages/project-manager/lib/projects.tcl 29 Aug 2005 06:19:13 -0000 1.18 @@ -135,9 +135,9 @@ # Get url of the contacts package if it has been mounted for the links on the index page. set contacts_url [util_memoize [list site_node::get_package_url -package_key contacts]] if {[empty_string_p $contacts_url]} { - set contact_column "@projects_${package_id}.customer_name@" + set contact_column "@projects.customer_name@" } else { - set contact_column "<a href=\"${contacts_url}contact?party_id=@projects_${package_id}.customer_id@\">@projects_${package_id}.customer_name@</a>" + set contact_column "<a href=\"${contacts_url}contact?party_id=@projects.customer_id@\">@projects.customer_name@</a>" } # Store project names and all other project individuel data Index: openacs-4/packages/project-manager/lib/task-date-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/Attic/task-date-portlet.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager/lib/task-date-portlet.adp 26 Aug 2005 20:59:12 -0000 1.2 +++ openacs-4/packages/project-manager/lib/task-date-portlet.adp 29 Aug 2005 06:19:13 -0000 1.3 @@ -4,27 +4,35 @@ <tr> <td colspan="2"> <table border="0" width="100%"> - <tr> - <td class="highlight">#project-manager.Earliest_start#</td> - <td>@task_info.earliest_start@ </td> - </tr> + <if @task_info.earliest_start@ not nil> + <tr> + <td class="highlight">#project-manager.Earliest_start#</td> + <td>@task_info.earliest_start@ </td> + </tr> + </if> - <tr> - <td class="highlight">#project-manager.Earliest_finish#</td> - <td>@task_info.earliest_finish@</td> - </tr> + <if @task_info.earliest_finish@ not nil> + <tr> + <td class="highlight">#project-manager.Earliest_finish#</td> + <td>@task_info.earliest_finish@</td> + </tr> + </if> - <tr> - <td class="highlight">#project-manager.Latest_start#</td> - <td>@task_info.latest_start@</td> - </tr> + <if @task_info.latest_start@ not nil> + <tr> + <td class="highlight">#project-manager.Latest_start#</td> + <td>@task_info.latest_start@</td> + </tr> + </if> - <tr> - <td class="highlight">#project-manager.Latest_finish#</td> - <td><b>@task_info.latest_finish@</b></td> - </tr> + <if @task_info.latest_finish@ not nil> + <tr> + <td class="highlight">#project-manager.Latest_finish#</td> + <td><b>@task_info.latest_finish@</b></td> + </tr> + </if> - <if @task_info.latest_finish@ ne @task_info.end_date@> + <if @task_info.end_date@ not nil and @task_info.latest_finish@ ne @task_info.end_date@> <tr> <td class="highlight">#project-manager.Deadline_1#</td> <td><b>@task_info.end_date@</b></td> Index: openacs-4/packages/project-manager/lib/task-date-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/Attic/task-date-portlet.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager/lib/task-date-portlet.tcl 26 Aug 2005 20:59:12 -0000 1.2 +++ openacs-4/packages/project-manager/lib/task-date-portlet.tcl 29 Aug 2005 06:19:13 -0000 1.3 @@ -34,9 +34,9 @@ -percent_complete $task_info(percent_complete)] # format the dates according to the local settings -set task_info(earliest_start) [lc_time_fmt $task_info(earliest_start) "%x"] -set task_info(earliest_finish) [lc_time_fmt $task_info(earliest_finish) "%x"] -set task_info(latest_start) [lc_time_fmt $task_info(latest_start) "%x"] -set task_info(latest_finish) [lc_time_fmt $task_info(latest_finish) "%x"] -set task_info(end_date) [lc_time_fmt $task_info(end_date) "%x"] +#set task_info(earliest_start) [lc_time_fmt $task_info(earliest_start) "%x"] +#set task_info(earliest_finish) [lc_time_fmt $task_info(earliest_finish) "%x"] +#set task_info(latest_start) [lc_time_fmt $task_info(latest_start) "%x"] +#set task_info(latest_finish) [lc_time_fmt $task_info(latest_finish) "%x"] +#set task_info(end_date) [lc_time_fmt $task_info(end_date) "%x"]