Changeset 734 for framework

Show
Ignore:
Timestamp:
07/21/08 09:31:33 (4 months ago)
Author:
kroche
Message:

Post Incomplete updates

Location:
framework/trunk/scaffolder
Files:
77 added
4 modified

Legend:

Unmodified
Added
Removed

  • framework/trunk/scaffolder/scaffolder/Metadata.cfc

    r710 r734  
    15581558        </cffunction> 
    15591559         
     1560        <cffunction name="getFieldFromXML" returntype="struct" output="No"  
     1561                                hint="I return a structure of a particular field for a table." > 
     1562                <cfargument name="table" type="string" required="Yes" hint="I am the name of the table who's fields are to be output."> 
     1563                <cfargument name="field" type="string" required="Yes" hint="I am the name of the field required."> 
     1564                <cfargument name="select" type="string" required="No" default="name" hint="Choose either the name or alias."> 
     1565                <cfset var i = 0> 
     1566                <cfset var aFields = getFieldsFromXML(arguments.table)> 
     1567                <cfset var stField = structNew()> 
     1568                 
     1569                <cfloop from="1" to="#arrayLen(aFields)#" index="i"> 
     1570                        <cfif structKeyExists(aFields[i],arguments.select) AND arguments.field IS aFields[i][arguments.select]> 
     1571                                <cfreturn aFields[i]> 
     1572                        <cfelseif arguments.field IS aFields[i].name> 
     1573                                <cfreturn aFields[i]> 
     1574                        </cfif> 
     1575                </cfloop> 
     1576                <cfreturn structNew()> 
     1577        </cffunction> 
     1578         
    15601579        <cffunction name="getFieldListFromXML" returntype="string" output="No"  
    15611580                                hint="I return a list of field aliases for a table." > 
    … …  
    16511670                <cfset var i = 0> 
    16521671                <cfset var j = 0> 
     1672                <cfset var temp = ""> 
    16531673                <cfset var aRelationships = ArrayNew(1)> 
    16541674                <cfset var quotedTable = "'#arguments.table#'"> 
    … …  
    16591679                        <cfset stData = structNew()> 
    16601680                        <cfset stData["Name"] = xRelationships[i].XmlAttributes.name> 
    1661                         <cfset stData["JoinType"] = iif(structkeyExists(xRelationships[i].XmlAttributes,"fkName"),"'INNER'","'LEFT OUTER'")> 
     1681                        <cfset temp = xRelationships[i].XmlChildren[1].XmlAttributes.from> 
     1682                        <cfset stData["Required"] = getFieldFromXML(arguments.table,temp).required> 
     1683                        <cfset stData["JoinType"] = iif(structkeyExists(xRelationships[i].XmlAttributes,"fkName") AND stData.required,"'INNER'","'LEFT OUTER'")> 
    16621684                        <cfif structKeyExists(xRelationships[i].XmlAttributes,"alias")> 
    16631685                                <cfset stData["Alias"] = xRelationships[i].XmlAttributes.alias> 

  • framework/trunk/scaffolder/templates/ColdSpring/dsp_layout.cfm

    r711 r734  
    7171} 
    7272</style> 
     73<cfoutput> 
    7374#request.page.stylesheets# 
    7475#request.page.javascript# 
     76</cfoutput> 
    7577</head> 
    7678 

  • framework/trunk/scaffolder/templates/ColdSpring/validate2.cfc

    r710 r734  
    4040                 
    4141                <cfloop list="#arguments.fieldList#" index="thisField"> 
    42                         <cfset Evaluate("validate#thisField#(this$$objectName$$,errors)")> 
     42                        <cfset errors = Evaluate("validate#thisField#(this$$objectName$$,errors)")> 
    4343                </cfloop> 
    4444                <cfreturn errors> 

  • framework/trunk/scaffolder/templates/Reactor/dsp_layout.cfm

    r711 r734  
    7171} 
    7272</style> 
     73<cfoutput> 
    7374#request.page.stylesheets# 
    7475#request.page.javascript# 
     76</cfoutput> 
    7577</head> 
    7678