Index: openacs-4/packages/logger/www/log.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.tcl,v
diff -u -r1.9.4.1 -r1.9.4.2
--- openacs-4/packages/logger/www/log.tcl 13 May 2003 10:09:56 -0000 1.9.4.1
+++ openacs-4/packages/logger/www/log.tcl 13 May 2003 15:42:22 -0000 1.9.4.2
@@ -8,6 +8,8 @@
entry_id:integer,optional
project_id:integer,optional
variable_id:integer,optional
+ {edit:boolean "f"}
+ {return_url "."}
} -validate {
project_id_required_in_add_mode {
# For the sake of simplicity of the form
@@ -29,7 +31,7 @@
if { [string equal [form get_action log_entry_form] "done"] } {
# User is done editing - redirect back to index page
- ad_returnredirect .
+ ad_returnredirect $return_url
ad_script_abort
}
@@ -84,7 +86,7 @@
if { [exists_and_not_null entry_id] } {
# Initial request in display or edit mode or a submit of the form
set page_title "Edit Log Entry"
- if { $edit_p } {
+ if { [string equal $edit "t"] && $edit_p } {
set ad_form_mode edit
} else {
set ad_form_mode display
@@ -105,7 +107,7 @@
}
lappend actions { Done done }
-ad_form -name log_entry_form -cancel_url index -mode $ad_form_mode \
+ad_form -name log_entry_form -cancel_url $return_url -mode $ad_form_mode \
-actions $actions -form {
entry_id:key(acs_object_id_seq)
}
@@ -127,6 +129,8 @@
{variable_id:integer(hidden)
{value $variable_id}
}
+
+ {return_url:text(hidden) {value $return_url}}
}
# Add form elements common to all modes
@@ -206,8 +210,7 @@
-time_stamp $time_stamp_ansi \
-description $description
} -after_submit {
-
- ad_returnredirect "[ad_conn url]?[export_vars { project_id variable_id }]"
+ ad_returnredirect "[ad_conn url]?[export_vars { project_id variable_id return_url }]"
ad_script_abort
}
Index: openacs-4/packages/logger/www/lib/entries-table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table.adp,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/logger/www/lib/entries-table.adp 13 May 2003 10:10:36 -0000 1.4.2.1
+++ openacs-4/packages/logger/www/lib/entries-table.adp 13 May 2003 15:42:42 -0000 1.4.2.2
@@ -28,22 +28,24 @@
</else>
<td class="logger_listing_narrow">
<if @entries.edit_p@ or @current_user_id@ eq @entries.user_id@>
- <a href="@entries.entry_url@" title="Edit this log entry"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
+ <a href="@entries.edit_url@" title="Edit this log entry"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
</if>
</td>
<td class="logger_listing_narrow">@entries.project_name@</td>
<td class="logger_listing_narrow">@entries.user_chunk@</td>
<td class="logger_listing_narrow" align="left">@entries.time_stamp_pretty@</td>
<td class="logger_listing_narrow" align="right" nowrap>
<if @entries.edit_p@ or @current_user_id@ eq @entries.user_id@>
- <a href="@entries.entry_url@" title="Edit this log entry">@entries.value@</a>
+ <a href="@entries.view_url@" title="View this log entry">@entries.value@</a>
</if>
<else>
- <a href="@entries.entry_url@" title="Display this log entry">@entries.value@</a>
+ <a href="@entries.view_url@" title="View this log entry">@entries.value@</a>
</else>
</td>
- <td class="logger_listing_narrow">@entries.description@</td>
<td class="logger_listing_narrow">
+ <a href="@entries.view_url@" title="View this log entry">@entries.description@</a>
+ </td>
+ <td class="logger_listing_narrow">
<if @entries.delete_url@ not nil>
<a href="@entries.delete_url@" onclick="@entries.delete_onclick@" title="Delete this log entry"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a>
</if>
Index: openacs-4/packages/logger/www/lib/entries-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/logger/www/lib/entries-table.tcl 13 May 2003 10:10:36 -0000 1.5.2.1
+++ openacs-4/packages/logger/www/lib/entries-table.tcl 13 May 2003 15:42:42 -0000 1.5.2.2
@@ -51,12 +51,13 @@
set value_total 0
set value_count 0
-db_multirow -extend { entry_url delete_url delete_onclick user_chunk selected_p } entries select_entries {} {
+db_multirow -extend { view_url edit_url delete_url delete_onclick user_chunk selected_p } entries select_entries {} {
set description [string_truncate -len 50 $description]
set project_name [string_truncate -len 20 $project_name]
set selected_p [string equal $id $selected_entry_id]
set action_links_list [list]
- set entry_url "log?[export_vars { { entry_id $id } }]"
+ set view_url "log?[export_vars { { entry_id $id } }]"
+ set edit_url "log?[export_vars { { entry_id $id } { edit "t" } }]"
if { $delete_p } {
set delete_onclick "return confirm('Are you sure you want to delete log entry with $value $variable(unit) $variable(name) on $time_stamp?');"
set delete_url "log-delete?[export_vars { { entry_id $id } }]"