Skip to content

Commit 009dc40

Browse files
committed
Auto merge of #4021 - Turbo87:empty-license, r=locks
VersionList::Row: Adjust for missing `license` information Some of the earliest versions were published without any license information at all #### Before <img width="479" alt="Bildschirmfoto 2021-10-17 um 10 16 22" src="https://user-images.githubusercontent.com/141300/137618185-794405fd-1a40-4709-b3f7-314929bf2ae7.png"> #### After <img width="576" alt="Bildschirmfoto 2021-10-17 um 10 16 12" src="https://user-images.githubusercontent.com/141300/137618186-694404c2-a9ef-42b4-91d1-ecc39d722b62.png">
2 parents 33f2603 + 9a08053 commit 009dc40

File tree

1 file changed

+32
-28
lines changed

1 file changed

+32
-28
lines changed

app/components/version-list/row.hbs

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,37 +58,41 @@
5858
</time>
5959
</div>
6060

61-
<div local-class="metadata-row">
62-
{{#if @version.crate_size}}
63-
<span local-class="bytes">
64-
{{svg-jar "weight"}}
65-
{{pretty-bytes @version.crate_size}}
66-
</span>
67-
{{/if}}
61+
{{#if (or @version.crate_size @version.license @version.featureList)}}
62+
<div local-class="metadata-row">
63+
{{#if @version.crate_size}}
64+
<span local-class="bytes">
65+
{{svg-jar "weight"}}
66+
{{pretty-bytes @version.crate_size}}
67+
</span>
68+
{{/if}}
6869

69-
<span local-class="license">
70-
{{svg-jar "license"}}
71-
<LicenseExpression @license={{@version.license}} />
72-
</span>
70+
{{#if @version.license}}
71+
<span local-class="license">
72+
{{svg-jar "license"}}
73+
<LicenseExpression @license={{@version.license}} />
74+
</span>
75+
{{/if}}
7376

74-
{{#if @version.featureList}}
75-
<span local-class="num-features" data-test-feature-list>
76-
{{svg-jar "checkbox"}}
77-
{{@version.featureList.length}} {{if (eq @version.featureList.length 1) "Feature" "Features"}}
77+
{{#if @version.featureList}}
78+
<span local-class="num-features" data-test-feature-list>
79+
{{svg-jar "checkbox"}}
80+
{{@version.featureList.length}} {{if (eq @version.featureList.length 1) "Feature" "Features"}}
7881

79-
<EmberTooltip>
80-
<ul local-class="feature-list">
81-
{{#each @version.featureList as |feature|}}
82-
<li>
83-
{{svg-jar (if feature.isDefault "checkbox" "checkbox-empty")}}
84-
{{feature.name}}
85-
</li>
86-
{{/each}}
87-
</ul>
88-
</EmberTooltip>
89-
</span>
90-
{{/if}}
91-
</div>
82+
<EmberTooltip>
83+
<ul local-class="feature-list">
84+
{{#each @version.featureList as |feature|}}
85+
<li>
86+
{{svg-jar (if feature.isDefault "checkbox" "checkbox-empty")}}
87+
{{feature.name}}
88+
</li>
89+
{{/each}}
90+
</ul>
91+
</EmberTooltip>
92+
</span>
93+
{{/if}}
94+
</div>
95+
{{/if}}
9296
</div>
9397

9498
{{#if this.isOwner}}

0 commit comments

Comments
 (0)