Index: openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp	25 Apr 2005 13:36:20 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp	25 Apr 2005 13:40:33 -0000	1.4
@@ -19,7 +19,7 @@
     <tr class="even">
   </else>
 
-<td valign="top">@items.rownum@. @items.name@<if @items.required_p@ eq t> <font color=red>*</font> </if>
+<td valign="top">@items.rownum@. @items.field_name@<if @items.required_p@ eq t> <font color=red>*</font> </if>
 <if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
 (@items.points@ #assessment.points#)
 </td></tr>
@@ -33,7 +33,7 @@
 
 <td>
   <blockquote>
-    <if @items.presentation_type@ ne fitb>@items.title;noquote@<br></if>
+    <if @items.presentation_type@ ne fitb>@items.title;noquote@<br><if @items.description@ not nil>@items.description;noquote@<br></if></if>
     <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
       <if @items.choice_orientation@ ne horizontal>
         <formgroup id="response_to_item.@items.as_item_id@">
Index: openacs-4/packages/assessment/www/asm-admin/catalog-item-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-item-add.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/catalog-item-add.xql	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/catalog-item-add.xql	25 Apr 2005 13:40:33 -0000	1.2
@@ -14,8 +14,8 @@
 <fullquery name="items">
       <querytext>
       
-    select i.as_item_id, i.subtext, cr.title, ci.name, i.required_p,
-           i.max_time_to_complete, i.points
+    select i.as_item_id, i.subtext, cr.title, i.field_name, i.required_p,
+           i.max_time_to_complete, i.points, cr.description
     from as_items i, cr_revisions cr, cr_items ci
     where ci.item_id = cr.item_id
     and cr.revision_id = i.as_item_id