Index: openacs-4/packages/dotlrn-ecommerce/www/applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/applications.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 16 Aug 2005 10:36:27 -0000 1.19
+++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 16 Aug 2005 13:23:08 -0000 1.20
@@ -141,12 +141,10 @@
comments {
label "[_ dotlrn-ecommerce.Notes]"
display_template {
-
+ @applications.comments_truncate;noquote@
+
[_ dotlrn-ecommerce.Add_note]
-
-
- [_ dotlrn-ecommerce.View]
-
+
}
}
comments_text_plain {
@@ -224,7 +222,7 @@
set general_comments_url [apm_package_url_from_key "general-comments"]
-db_multirow -extend { approve_url reject_url asm_url section_edit_url person_url register_url comments comments_text_plain add_comment_url } applications applications [subst {
+db_multirow -extend { approve_url reject_url asm_url section_edit_url person_url register_url comments comments_text_plain comments_truncate add_comment_url } applications applications [subst {
select person__name(r.user_id) as person_name, member_state, r.community_id, r.user_id as applicant_user_id, s.section_name, t.course_name, s.section_id, r.rel_id, e.phone, o.creation_user as patron_id,
(select count(*)
from (select *
@@ -341,12 +339,13 @@
} else {
set html_comment $gc_content
}
- append comments "$gc_title
${html_comment}
- $gc_author on $gc_creation_date_ansi
"
+ set edit_comment_url [export_vars -base "${general_comments_url}comment-edit" {return_url comment_id}]
+ set comments "$gc_title
${html_comment}
- $gc_author on $gc_creation_date_ansi
"
+ set comments_text [ad_html_text_convert -from "text/html" -to "text/plain" $html_comment]
+ append comments_text_plain "${comments_text}\n"
+ append comments_truncate "[ad_html_text_convert -from "text/plain" -to "text/html" -truncate_len 100 $comments_text] \[edit\]
"
}
- if {[empty_string_p $comments]} {
- set add_comment_url [export_vars -base "${general_comments_url}comment-add" {{object_id $session_id} {object_name "Application"} return_url}]
- }
- set comments_text_plain [ad_html_text_convert -from "text/html" -to "text/plain" $html_comment]
+ set add_comment_url [export_vars -base "${general_comments_url}comment-add" {{object_id $session_id} {object_name "Application"} return_url}]
}
}