Skip to content

Commit b9fb56b

Browse files
committed
default to latest when requested version doesn't exists
1 parent 725e73f commit b9fb56b

File tree

1 file changed

+36
-30
lines changed

1 file changed

+36
-30
lines changed

apps/download/index.cfm

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -317,32 +317,40 @@
317317
<cfloop struct="#versions#" index="vs" item="data">
318318
<cfif vs=="05.003.007.0044.100"><cfcontinue></cfif><cfif data.type==_type><option <cfif url[_type]==vs><cfset rows[_type]=vs> selected="selected"</cfif> value="#vs#"><cfset arrayAppend(_versions[_type],data.version)>#data.versionNoAppendix#</option></cfif>
319319
</cfloop>
320-
</select>
321-
</div>
322-
<cfset dw=versions[rows[_type]]>
323-
<!--- desc --->
324-
<div class="desc descDiv row_even">
325-
<cfset res=download.getReleaseDate(dw.version)>
326-
<span style="font-weight:600">#dw.version#</span><cfif len(res)>
327-
320+
</select>
321+
</div>
322+
<cfscript>
323+
if ( !structKeyExists( rows,_type ) ){
324+
// requested version doesn't exist, fallback on latest
325+
vs = download.getLatestVersionForType( versions, _type );
326+
url[_type]=vs;
327+
rows[_type]=vs;
328+
}
329+
</cfscript>
330+
<cfset dw=versions[rows[_type]]>
331+
<!--- desc --->
332+
<div class="desc descDiv row_even">
333+
<cfset res=download.getReleaseDate(dw.version)>
334+
<span style="font-weight:600">#dw.version#</span><cfif len(res)>
328335
<span style="font-size:12px">(#res#)</span></cfif><br><br>
329-
330-
#lang.desc[_type]#</div>
331-
332-
<!--- Express --->
333-
<cfif structKeyExists(dw,"express")><div class="row_odd divHeight">
334-
<cfif doS3.express>
335-
<cfset uri="#cdnURL##dw.express#">
336-
<cfelse>
337-
<cfset uri="#baseURL#express/#dw.version#">
338-
</cfif>
339-
<div class="fontStyle">
340-
<a href="#uri#">Express</a>
341-
<span class="triggerIcon pointer" style="color :##01798A" title="#lang.express#">
342-
<span class="glyphicon glyphicon-info-sign"></span>
343-
</span>
344-
</div>
345-
</div></cfif>
336+
#lang.desc[_type]#</div>
337+
338+
<!--- Express --->
339+
<cfif structKeyExists(dw,"express")>
340+
<div class="row_odd divHeight">
341+
<cfif doS3.express>
342+
<cfset uri="#cdnURL##dw.express#">
343+
<cfelse>
344+
<cfset uri="#baseURL#express/#dw.version#">
345+
</cfif>
346+
<div class="fontStyle">
347+
<a href="#uri#">Express</a>
348+
<span class="triggerIcon pointer" style="color :##01798A" title="#lang.express#">
349+
<span class="glyphicon glyphicon-info-sign"></span>
350+
</span>
351+
</div>
352+
</div>
353+
</cfif>
346354
<!--- Installer --->
347355
<div class="row_even installerDiv">
348356
<cfif _type == "releases">
@@ -375,11 +383,11 @@
375383
</div>
376384
<!--- jar --->
377385
<div class="row_odd jarDiv">
378-
<cfif structKeyExists(dw,"jar")>
386+
<cfif structKeyExists(dw,"jar")>
379387
<cfif doS3.jar>
380-
<cfset uri="#cdnURL##dw.jar#">
388+
<cfset uri="#cdnURL##dw.jar#">
381389
<cfelse>
382-
<cfset uri="#baseURL#loader/#dw.version#">
390+
<cfset uri="#baseURL#loader/#dw.version#">
383391
</cfif>
384392

385393
<div class="fontStyle"><a href="#(uri)#">lucee.jar</a><span class="triggerIcon pointer" style="color :##01798A" title="#lang.jar#">
@@ -407,8 +415,6 @@
407415
<span class="glyphicon glyphicon-info-sign"></span>
408416
</span></div>
409417
</cfif>
410-
411-
412418
</div>
413419
<!--- core --->
414420
<cfif structKeyExists(dw,"lco")><div class="row_even divHeight">

0 commit comments

Comments
 (0)