Skip to content

Changes to view-comment.tcl and .adp to correct misbehavior while switching between revisions #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
serol1971 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Changes to view-comment.tcl and .adp to correct misbehavior while switching between revisions #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53408ea
Prolem: Switching between revisions was not possible as the URL param…
serol1971 Jan 9, 2012
a0cd00a
Replaced variable revision_id with curr_revision_id as a consequence …
serol1971 Jan 9, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion www/view-comment.adp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<h2>#general-comments.Revisions#</h2>
<ul>
<multiple name=revisions>
<if @revision_id@ eq @revisions.revision_id@>
<if @curr_revision_id@ eq @revisions.revision_id@>
<li>@revisions.revision_date@
</if>
<else>
Expand Down
4 changes: 3 additions & 1 deletion www/view-comment.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ad_page_contract {
} {
comment_id:notnull
{ revision_id {} }
{ curr_revision_id {} }
{ object_name {} }
{ return_url {} }
} -properties {
Expand Down Expand Up @@ -42,6 +43,7 @@ set admin_p [ad_permission_p $package_id admin]

# if the user has write permissions then allow
# viewing of selected revision
set curr_revision_id $revision_id
if { $write_perm_p == 1 } {
if { [empty_string_p $revision_id] } {
# get the latest revision
Expand Down Expand Up @@ -122,7 +124,7 @@ set action_url_add_url [export_vars -base "url-add" {{parent_id $comment_id} ret

# Revisions section
set return_url_view "../${return_url_view}"
if { $live_revision ne $revision_id } {
if { $live_revision ne $curr_revision_id } {
set font_color "red"
set pre_text [_ general-comments.lt_This_revision_is_not_]
set admin_toggle_url [export_vars -base "admin/toggle-approval" {comment_id revision_id {return_url $return_url_view}}]
Expand Down