Changeset 2816

Timestamp:

09/09/10 19:14:27 (17 months ago)

Author:

mattlevine

Message:

1. Adding setAllValues and getAllValues to the rateBean.
2. Changing extendObjectFeedBean.getQUery() from group by to select distinct

Location:

trunk/www

Files:

• admin/view/vAdvertising (modified) (1 prop)
• config/coldspring.xml.cfm (modified) (1 prop)
• default/includes/display_objects/dsp_adZone.cfm (modified) (1 prop)
• default/includes/themes/merced/display_objects (modified) (1 prop)
• default/includes/themes/merced/resourceBundles (modified) (1 prop)
• default/includes/themes/merced/templates/cfmx7/inc (modified) (1 prop)
• default/includes/themes/merced/templates/components (modified) (1 prop)
• requirements/mura/advertising (modified) (1 prop)
• requirements/mura/content/file/fileManager.cfc (modified) (1 prop)
• requirements/mura/content/rater/rateBean.cfc (modified) (1 diff)
• requirements/mura/dbUpdates (modified) (1 prop)
• requirements/mura/extend (modified) (1 prop)
• requirements/mura/extend/extendObjectFeedBean.cfc (modified) (3 diffs)
• requirements/mura/resourceBundle (modified) (1 prop)
• tasks/ads (modified) (1 prop)

trunk/www/requirements/mura/content/rater/rateBean.cfc

@@ -97 +97 @@
 </cffunction>
 
+<cffunction name="setAllValues" returntype="any" access="public" output="false">
+        <cfargument name="instance">
+        <cfset variables.instance=arguments.instance/>
+        <cfreturn this>
+</cffunction>
+
+<cffunction name="getAllValues" returntype="any" access="public" output="false">
+        <cfreturn variables.instance>
+</cffunction>
+
 <cffunction name="setEntered" access="public" output="false">
         <cfargument name="entered" />

trunk/www/requirements/mura/extend/extendObjectFeedBean.cfc

@@ -251 +251 @@
         <cfquery name="rs" datasource="#variables.configBean.getDatasource()#" blockfactor="#blockFactor#"  username="#variables.configBean.getDBUsername()#" password="#variables.configBean.getDBPassword()#">
         <cfif dbType eq "oracle" and getMaxItems()>select * from (</cfif>
-        select  <cfif dbtype eq "mssql" and getMaxItems()>top #getMaxItems()#</cfif>    
+        select distinct <cfif dbtype eq "mssql" and getMaxItems()>top #getMaxItems()#</cfif>    
         tclassextend.type,tclassextend.subtype,tclassextend.siteID, #dataTable#.baseID as ID
         from #dataTable#
@@ -271 +271 @@
         on (#dataTable#.baseID=qExtendedSort.baseID)
         </cfif>
-
         
         where
@@ -335 +334 @@
                 <cfif started>)</cfif>
         </cfif>
-
-        group by tclassextend.type,tclassextend.subtype,tclassextend.siteID,#dataTable#.baseID
         
         <cfif len(getSortBy())>