Index: openacs-4/packages/contacts/www/admin/attribute-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/attribute-list.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/admin/attribute-list.xql	14 Nov 2005 20:42:04 -0000	1.2
+++ openacs-4/packages/contacts/www/admin/attribute-list.xql	18 Nov 2005 17:48:27 -0000	1.3
@@ -30,20 +30,42 @@
         select
 		distinct
                 lam.attribute_id,
-		a.pretty_name
+		a.pretty_name,
+		a.attribute_name
         from
                 ams_list_attribute_map lam,
                 ams_lists l,
 		ams_attributes a
         where
                 lam.list_id = l.list_id
 		and lam.attribute_id = a.attribute_id
+                [template::list::page_where_clause -and -name "ams_options" -key "lam.attribute_id"]
+		$extend_query
                 $search_for_clause
-	order by
-		pretty_name asc
+                [template::list::orderby_clause -name "ams_options" -orderby]
     </querytext>
 </fullquery>
 
+<fullquery name="get_ams_options_pagination">
+    <querytext>
+        select
+		distinct
+                lam.attribute_id,
+		a.pretty_name,
+		a.attribute_name	
+        from
+                ams_list_attribute_map lam,
+                ams_lists l,
+		ams_attributes a
+        where
+                lam.list_id = l.list_id
+		and lam.attribute_id = a.attribute_id
+		$extend_query
+                $search_for_clause
+                [template::list::orderby_clause -name "ams_options" -orderby]
+    </querytext>
+</fullquery>
+
 <fullquery name="get_default_p">
     <querytext>
 	select