Index: openacs-4/packages/xowiki/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/notification-procs.tcl,v
diff -u -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/xowiki/tcl/notification-procs.tcl 9 Feb 2016 11:53:19 -0000 1.21.2.1
+++ openacs-4/packages/xowiki/tcl/notification-procs.tcl 19 Feb 2016 19:09:41 -0000 1.21.2.2
@@ -132,11 +132,11 @@
}
#ns_log notice "--n xowiki do_notifications called for revision_id $revision_id publish_status=[$page set publish_status]"
- $page instvar package_id
- set link [$page pretty_link -absolute 1]
- append html "
For more details, see [ns_quotehtml [$page set title]]
"
- append text "\nFor more details, see $link ...
\n"
+ set details [$page notification_detail_link]
+ append html [dict get $details html]
+ append text [dict get $details text]
+ $page instvar package_id
set state [expr {[$page set last_modified] eq [$page set creation_date] ? "New" : "Updated"}]
set instance_name [::$package_id instance_name]
@@ -147,7 +147,7 @@
-type_id [notification::type::get_type_id -short_name xowiki_notif] \
-object_id [$page set package_id] \
-response_id [$page set revision_id] \
- -notif_subject "\[$instance_name\] [$page set title] ($state)" \
+ -notif_subject [$page notification_subject -instance_name $instance_name -state $state] \
-notif_text $text \
-notif_html $html \
-notif_user $notif_user_id
@@ -170,7 +170,7 @@
-type_id [notification::type::get_type_id -short_name xowiki_notif] \
-object_id $cat($level) \
-response_id [$page set revision_id] \
- -notif_subject "\[$instance_name\] $label($level): [$page set title] ($state)" \
+ -notif_subject [$page notification_subject -instance_name $instance_name -category_label $label($level) -state $state] \
-notif_text $text \
-notif_html $html \
-notif_user $notif_user_id