@@ -682,10 +682,11 @@ <cfscript> var loc = {}; loc.query = findByKey(key=key(), reload=true, returnAs="query"); - loc.iEnd = ListLen(variables.wheels.class.propertyList); + loc.properties = propertyNames(); + loc.iEnd = ListLen(loc.properties); for (loc.i=1; loc.i <= loc.iEnd; loc.i++) { - loc.property = ListGetAt(variables.wheels.class.propertyList, loc.i); + loc.property = ListGetAt(loc.properties, loc.i); this[loc.property] = loc.query[loc.property][1]; } </cfscript> wheels/model/crud.cfm @@ -27,14 +27,20 @@ <!--- PUBLIC MODEL CLASS METHODS ---> -<cffunction name="propertyNames" returntype="string" access="public" output="false" hint="Returns a list of property names ordered by their respective column's ordinal position in the database table." +<cffunction name="propertyNames" returntype="string" access="public" output="false" hint="Returns a list of property names ordered by their respective column's ordinal position in the database table and with eventual calculated properties at the end." examples= ' <!--- Get a list of the property names in use in the user model ---> <cfset propNames = model("user").propertyNames()> ' categories="model-class,miscellaneous" chapters="object-relational-mapping" functions="columnNames,dataSource,property,table,tableName"> - <cfreturn variables.wheels.class.propertyList> + <cfscript> + var loc = {}; + loc.returnValue = variables.wheels.class.propertyList; + if (ListLen(variables.wheels.class.calculatedPropertyList)) + loc.returnValue = ListAppend(loc.returnValue, variables.wheels.class.calculatedPropertyList); + </cfscript> + <cfreturn loc.returnValue> </cffunction> <!--- PUBLIC MODEL OBJECT METHODS ---> wheels/model/properties.cfm 032cfe2788ba827956742e3b21d460804465f39a per.djurner per.djurner@d8ff095c-9719-0410-9cd3-1dd5d13d90f5 http://github.com/rip747/cfwheels/commit/49f689538e30003e452661ee6a2d9bc550c05024 49f689538e30003e452661ee6a2d9bc550c05024 2009-11-05T15:35:29-08:00 2009-11-05T15:35:29-08:00 Made propertyNames() return calculated properties as well. Made reload() reload calculated properties as well. git-svn-id: https://cfwheels.googlecode.com/svn/trunk@3667 d8ff095c-9719-0410-9cd3-1dd5d13d90f5 0aa8591659721e7c84c1470a90ca35d556b329f7 per.djurner per.djurner@d8ff095c-9719-0410-9cd3-1dd5d13d90f5