Index: openacs-4/packages/notifications/notifications.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/notifications.info,v
diff -u -N -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/notifications/notifications.info 9 Dec 2002 14:33:18 -0000 1.11.2.2
+++ openacs-4/packages/notifications/notifications.info 11 Dec 2002 02:13:09 -0000 1.11.2.3
@@ -7,7 +7,7 @@
f
t
-
+
oracle
postgresql
@@ -33,7 +33,6 @@
-
@@ -46,6 +45,7 @@
+
@@ -75,21 +75,26 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
Index: openacs-4/packages/notifications/www/manage-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage-oracle.xql,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/notifications/www/manage-oracle.xql 20 Sep 2002 21:19:01 -0000 1.1
+++ openacs-4/packages/notifications/www/manage-oracle.xql 11 Dec 2002 02:13:28 -0000 1.1.2.1
@@ -10,21 +10,7 @@
from notification_types
where notification_types.type_id =
notification_requests.type_id) as type,
- decode ((select short_name
- from notification_types
- where notification_types.type_id =
- notification_requests.type_id),
- 'forums_forum_notif',
- (select name
- from forums_forums
- where forum_id =
- notification_requests.object_id),
- 'forums_message_notif',
- (select subject
- from forums_messages
- where message_id =
- notification_requests.object_id),
- '') as object_name,
+ acs_object.name(notification_requests.object_id) as object_name,
(select name
from notification_intervals
where notification_intervals.interval_id =
Index: openacs-4/packages/notifications/www/manage-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage-postgresql.xql,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/notifications/www/manage-postgresql.xql 20 Nov 2002 23:07:13 -0000 1.1.2.1
+++ openacs-4/packages/notifications/www/manage-postgresql.xql 11 Dec 2002 02:13:28 -0000 1.1.2.2
@@ -10,7 +10,7 @@
from notification_types
where notification_types.type_id =
notification_requests.type_id) as type,
- acs_object__name(notification_requests.object_id) as object_name,
+ acs_object__name(notification_requests.object_id) as object_name,
(select name
from notification_intervals
where notification_intervals.interval_id =
Index: openacs-4/packages/notifications/www/manage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.adp,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/notifications/www/manage.adp 20 Sep 2002 21:19:01 -0000 1.1
+++ openacs-4/packages/notifications/www/manage.adp 11 Dec 2002 02:13:28 -0000 1.1.2.1
@@ -1,6 +1,6 @@
Manage Notifications
-"manage notifications"
+@context@
Index: openacs-4/packages/notifications/www/manage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.tcl,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/notifications/www/manage.tcl 20 Sep 2002 21:19:01 -0000 1.1
+++ openacs-4/packages/notifications/www/manage.tcl 11 Dec 2002 02:13:28 -0000 1.1.2.1
@@ -9,7 +9,8 @@
set user_id [ad_conn user_id]
set return_url [ad_conn url]
+set context [list "Manage Notifications"]
db_multirow notifications select_notifications {}
-ad_return_template
\ No newline at end of file
+ad_return_template
Index: openacs-4/packages/notifications/www/request-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/notifications/www/request-new.tcl 16 Sep 2002 12:36:31 -0000 1.5
+++ openacs-4/packages/notifications/www/request-new.tcl 11 Dec 2002 02:13:28 -0000 1.5.2.1
@@ -17,7 +17,6 @@
# Check that the object can be subcribed to
notification::security::require_notify_object -object_id $object_id
-
if {[empty_string_p $pretty_name]} {
set page_title "Request Notification"
} else {
@@ -26,27 +25,16 @@
set context [list "Request Notification"]
+set intervals [notification::get_intervals -type_id $type_id]
+set delivery_methods [notification::get_delivery_methods -type_id $type_id]
-form create subscribe
+ad_form -name subscribe -export {type_id object_id return_url} -form {
+ {interval_id:integer(select) {label "Notification Interval"}
+ {options $intervals}}
+ {delivery_method_id:integer(select) {label "Delivery Method"}
+ {options $delivery_methods}}
+} -on_submit {
-element create subscribe type_id \
- -label "Type ID" -datatype integer -widget hidden
-
-element create subscribe object_id \
- -label "Object ID" -datatype integer -widget hidden
-
-element create subscribe return_url \
- -label "Return URL" -datatype text -widget hidden
-
-element create subscribe interval_id \
- -label "Notification Interval" -datatype integer -widget select -options [notification::get_intervals -type_id $type_id]
-
-element create subscribe delivery_method_id \
- -label "Delivery Method" -datatype integer -widget select -options [notification::get_delivery_methods -type_id $type_id]
-
-if {[form is_valid subscribe]} {
- template::form get_values subscribe type_id object_id return_url interval_id delivery_method_id
-
# Add the subscribe
notification::request::new \
-type_id $type_id \
@@ -58,7 +46,5 @@
ad_returnredirect $return_url
ad_script_abort
}
-
-element set_properties subscribe type_id -value $type_id
-element set_properties subscribe object_id -value $object_id
-element set_properties subscribe return_url -value $return_url
+
+ad_return_template