Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/modules/items/index-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/modules/items/index-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/cms/www/modules/items/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.adp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/cms/www/modules/items/index.adp	31 May 2005 04:58:08 -0000	1.7.2.1
+++ openacs-4/packages/cms/www/modules/items/index.adp	29 Nov 2005 21:36:05 -0000	1.7.2.2
@@ -93,7 +93,7 @@
   <li><a href="rename?item_id=@item_id@&mount_point=@mount_point@&item_props_tab=@item_props_tab@">
     Rename</a> this content item</li>
   <li><a href="delete?item_id=@item_id@&mount_point=@mount_point@" 
-     onClick="return confirm('Warning! You are about to delete this content item.');">
+     onClick="return confirm('Warning! You are about to delete this @type_pretty_name@: @title@.');">
      Delete</a> this content item</li>
  </ul>
 </if>
Index: openacs-4/packages/cms/www/modules/items/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.tcl,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/cms/www/modules/items/index.tcl	6 Jun 2005 17:07:23 -0000	1.9.2.1
+++ openacs-4/packages/cms/www/modules/items/index.tcl	29 Nov 2005 21:36:05 -0000	1.9.2.2
@@ -21,23 +21,20 @@
 }
 
 # resolve any symlinks
-set resolved_item_id [db_string get_item_id ""]
+set item_id [content::symlink::resolve -item_id $item_id]
 
-set item_id $resolved_item_id
-
 set user_id [auth::require_login]
 permission::require_permission -party_id $user_id \
     -object_id $item_id -privilege read
 
 set can_edit_p [permission::permission_p -party_id $user_id \
 		    -object_id $item_id -privilege write]
 
-# query the content_type of the item ID so we can check for a custom info page
+# query the content_type of the item ID so we can check for a custom info page (among other things)
 db_1row get_info "" -column_array info
 template::util::array_to_vars info
 
-set item_title [db_string get_item_title ""]
-set page_title "Content Item - $item_title"
+set page_title "Content Item - $title"
 
 # build the path to the custom interface directory for this content type
 
Index: openacs-4/packages/cms/www/modules/items/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/cms/www/modules/items/index.xql	16 Nov 2004 22:32:48 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/index.xql	29 Nov 2005 21:36:05 -0000	1.2.2.1
@@ -5,23 +5,18 @@
       <querytext>
       
   select 
-    i.content_type, i.latest_revision, r.description
+    i.content_type, i.latest_revision, r.title, 
+    r.description, o.pretty_name as type_pretty_name
   from 
-    cr_items i, cr_revisions r
+    cr_items i, cr_revisions r, acs_object_types o
   where 
    i.item_id = :item_id
   and 
    r.revision_id = content_item__get_best_revision(:item_id)
+  and 
+   i.content_type = o.object_type
 
       </querytext>
 </fullquery>
 
-<fullquery name="get_item_title">
- <querytext>
-
-  select title from cr_revisions where revision_id = :latest_revision
-
- </querytext>
-</fullquery>
- 
 </queryset>