Skip to content

Commit 66d1afa

Browse files
committed
always show releases even without content, but hide versions with no changelog
1 parent 3f18844 commit 66d1afa

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

apps/download/changelog/index.cfm

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
"6.0": true,
1010
"6.1": true,
1111
"6.2": true,
12-
"7.0": true
12+
"7.0": true,
13+
"7.1": true
1314
}; // todo pull this out of known verions
14-
defaultMajorVersion = "6.2";
15+
defaultMajorVersion = "7.0";
1516
param name="url.version" default="";
1617
if ( !structKeyExists( stMajorVersion, url.version ) ){
1718
if (structKeyExists( stMajorVersion, left( url.version, 3 ) ) )
@@ -102,22 +103,27 @@
102103
<cfset lastMajor = "">
103104
<div class="versionList">
104105
<cfloop array="#arrChangeLogs#" item="luceeVersion">
105-
<cfif lastMajor neq left(luceeVersion.version, 3) and luceeVersion.type neq "snapshots">
106+
<cfif lastMajor neq left(luceeVersion.version, 3) and luceeVersion.type neq "snapshots" and (structcount(luceeVersion.changelog) or luceeVersion.type eq "releases" or luceeVersion.type eq "rc")>
106107
<cfif len(lastMajor) eq 0>
107108
Lucee Releases:
108109
</cfif>
109110
<cfset lastMajor = left(LuceeVersion.version, 3)>
110-
<b><a href="?version=#left(luceeVersion.version,3)#"
111+
<b><a href="?version=#left(luceeVersion.version,3)#"
111112
data-version="#left(LuceeVersion.version, 3)#"
112113
data-status="#stMajorVersion[left(LuceeVersion.version, 3)] ?: 'Active'#"
113114
title="View all #left(LuceeVersion.version, 3)# releases - Status: #stMajorVersion[left(LuceeVersion.version, 3)] ?: 'Active'#">#left(LuceeVersion.version, 3)#</a>&nbsp;</b>&nbsp;
114-
<a href="?version=#left(luceeVersion.version,3)####luceeVersion.version#"
115-
data-version="#luceeVersion.version#"
116-
data-type="#luceeVersion.type#"
117-
data-release-date="#luceeVersion.versionReleaseDate#"
118-
data-git-tag="https://github.com/lucee/Lucee/tree/#listFirst(luceeVersion.version, '-')#"
119-
title="View changelog for #luceeVersion.version# - Type: #luceeVersion.type# - Released: #luceeVersion.versionReleaseDate#"
120-
>#luceeVersion.version#</a>&nbsp;
115+
<!--- Only show detailed versions for 5.4 and above --->
116+
<cfif val( left( luceeVersion.version, 3 ) ) gte 5.4>
117+
<a href="?version=#left(luceeVersion.version,3)####luceeVersion.version#"
118+
data-version="#luceeVersion.version#"
119+
data-type="#luceeVersion.type#"
120+
data-release-date="#luceeVersion.versionReleaseDate#"
121+
data-git-tag="https://github.com/lucee/Lucee/tree/#listFirst(luceeVersion.version, '-')#"
122+
title="View changelog for #luceeVersion.version# - Type: #luceeVersion.type# - Released: #luceeVersion.versionReleaseDate#"
123+
>#luceeVersion.version#</a>&nbsp;
124+
<cfelse>
125+
&nbsp;
126+
</cfif>
121127
</cfif>
122128
</cfloop>
123129
</div>
@@ -159,7 +165,7 @@
159165
<hr>
160166
<table cellSpacing=0 border=0 cellPadding=2 width="100%" class="changelogs table-striped">
161167
<cfloop array="#arrChangeLogs#" item="lv">
162-
<cfif structcount(lv.changelog) and left(lv.version,3) eq url.version>
168+
<cfif (structcount(lv.changelog) or lv.type eq "releases" or lv.type eq "rc") and left(lv.version,3) eq url.version>
163169
<cfif row neq 0>
164170
<tr>
165171
<td colspan="4"><hr></td>

0 commit comments

Comments
 (0)