Index: openacs-4/contrib/packages/classified-ads/www/admin/field-addedit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/admin/field-addedit.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/classified-ads/www/admin/field-addedit.xql	29 Jul 2003 09:10:42 -0000	1.3
+++ openacs-4/contrib/packages/classified-ads/www/admin/field-addedit.xql	21 Aug 2003 02:02:51 -0000	1.4
@@ -2,14 +2,24 @@
 <queryset>
     <fullquery name="field">
         <querytext>
-	    select aa.attribute_id, coalesce(aa.column_name, aa.attribute_name) as column_name, aa.default_value, coalesce(aa.table_name,at.table_name) as table_name, aa.storage, aa.datatype, aa.sort_order, aa.attribute_name, aa.pretty_name, aa.pretty_plural
-	    from acs_attributes aa,
-	    ca_attributes ca, acs_object_types at
-	    where aa.attribute_id = :attribute_id
-	    and aa.attribute_id = ca.attribute_id
-	    and (ca.package_id = :package_id or ca.sitewide_p = 't')
-	    and aa.object_type = :content_type
-	    and at.object_type = :content_type
+	    SELECT 
+                   aa.attribute_id, 
+                   coalesce(aa.column_name, aa.attribute_name) AS column_name, 
+                   aa.default_value, 
+                   coalesce(aa.table_name,at.table_name) AS table_name, 
+                   aa.storage, aa.datatype, aa.sort_order, aa.attribute_name, 
+                   aa.pretty_name, aa.pretty_plural
+	      FROM 
+                   acs_attributes aa,
+	           ca_attributes ca, acs_object_types at
+	     WHERE 
+                   aa.attribute_id = :attribute_id
+	       AND
+                   aa.attribute_id = ca.attribute_id
+	       AND 
+                   aa.object_type = :content_type
+	       AND 
+                   at.object_type = :content_type
         </querytext>
     </fullquery>