Index: openacs-4/packages/notifications/www/manage-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/Attic/manage-oracle.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/notifications/www/manage-oracle.xql	11 Dec 2002 02:13:28 -0000	1.1.2.1
+++ openacs-4/packages/notifications/www/manage-oracle.xql	24 Jan 2003 01:55:45 -0000	1.1.2.2
@@ -5,7 +5,8 @@
 
 <fullquery name="select_notifications">      
       <querytext>
-	select request_id, 
+	select request_id,
+	       type_id,
 	  (select pretty_name
 	   from notification_types
 	   where notification_types.type_id =
Index: openacs-4/packages/notifications/www/manage-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/Attic/manage-postgresql.xql,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/notifications/www/manage-postgresql.xql	11 Dec 2002 02:13:28 -0000	1.1.2.2
+++ openacs-4/packages/notifications/www/manage-postgresql.xql	24 Jan 2003 01:55:45 -0000	1.1.2.3
@@ -5,7 +5,8 @@
 
 <fullquery name="select_notifications">      
       <querytext>
-	select request_id, 
+	select request_id,
+	       type_id,
 	  (select pretty_name
 	   from notification_types
 	   where notification_types.type_id =
Index: openacs-4/packages/notifications/www/manage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/notifications/www/manage.adp	11 Dec 2002 02:13:28 -0000	1.1.2.1
+++ openacs-4/packages/notifications/www/manage.adp	24 Jan 2003 01:55:45 -0000	1.1.2.2
@@ -17,7 +17,7 @@
     <tr class="even">
 </else>
   <td>@notifications.type@</td>
-  <td><a href=object-goto.tcl?object_id=@notifications.object_id@>@notifications.object_name@</a></td> 
+  <td><a href=object-goto.tcl?object_id=@notifications.object_id@&type_id=@notifications.type_id@>@notifications.object_name@</a></td> 
   <td>@notifications.interval@ (<a href=request-change-frequency.tcl?return_url=@return_url@&request_id=@notifications.request_id@>Change</a>)</td> 
   <td><a href=request-delete.tcl?return_url=@return_url@&request_id=@notifications.request_id@>Unsubscribe</a></td>
 </tr>
Index: openacs-4/packages/notifications/www/manage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/notifications/www/manage.tcl	11 Dec 2002 02:13:28 -0000	1.1.2.1
+++ openacs-4/packages/notifications/www/manage.tcl	24 Jan 2003 01:55:45 -0000	1.1.2.2
@@ -7,6 +7,7 @@
     @cvs-id $Id$
 } {}
 
+ad_maybe_redirect_for_registration
 set user_id [ad_conn user_id]
 set return_url [ad_conn url]
 set context [list "Manage Notifications"]
Index: openacs-4/packages/notifications/www/object-goto.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/object-goto.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/notifications/www/object-goto.tcl	20 Sep 2002 21:19:01 -0000	1.1
+++ openacs-4/packages/notifications/www/object-goto.tcl	24 Jan 2003 01:55:45 -0000	1.1.2.1
@@ -6,18 +6,19 @@
     @cvs-id $Id$
 } {
     object_id:notnull
+    type_id:notnull
 } 
 
 
-# At the time of writing, the only supported
-# notification types were on the object types
-# forum_forums and forum_messages.  get_url
-# will handle both these types.  If there are
-# more type of notifications added, this file
-# has to be changed to handle them.  Perhaps
-# it could be handles in a generic way, using 
-# meta-data about the object_type to auto-generate
-# the url.
+# added type_id parameter to redirect to the correct page for an object
+# we need the implementation name which is not the same as the object_type
 
-ad_returnredirect [forum::notification::get_url $object_id]
+# look in tcl/delivery-procs.tcl, there is a get_impl_key proc that 
+# queries the acs_sc_impls table for the implementation name
+# but the query is delivery_type specific, so we can't use it here
 
+set sc_impl_name [db_string get_notif_type {}]
+
+set url [acs_sc_call NotificationType GetURL [list $object_id] $sc_impl_name]
+
+ad_returnredirect $url