Browse Source

Display zero values if we have them

Jordi Boggiano 9 years ago
parent
commit
a5d9b40469

+ 6 - 6
src/Packagist/WebBundle/Resources/views/Web/viewPackage.html.twig

@@ -151,12 +151,12 @@
                             <p><span>Overall:</span> {% if downloads.total is defined %}{{ downloads.total|number_format(0, '.', '&#8201;')|raw }}{% else %}N/A{% endif %}</p>
                             <p><span>30 days:</span> {% if downloads.monthly is defined %}{{ downloads.monthly|number_format(0, '.', '&#8201;')|raw }}{% else %}N/A{% endif %}</p>
                             <p><span>Today:</span> {% if downloads.daily is defined %}{{ downloads.daily|number_format(0, '.', '&#8201;')|raw }}{% else %}N/A{% endif %}</p>
-                            {% if package.gitHubWatches != null %}<br>{% endif %}
-                            {% if package.language != null %}<p><span>Language:</span> {{ package.language }}</p>{% endif %}
-                            {% if package.gitHubStars != null %}<p><span>Stars:</span> {{ package.gitHubStars|number_format(0, '.', '&#8201;')|raw }}</p>{% endif %}
-                            {% if package.gitHubWatches != null %}<p><span>Watches:</span> {{ package.gitHubWatches|number_format(0, '.', '&#8201;')|raw }}</p>{% endif %}
-                            {% if package.gitHubForks != null %}<p><span>Forks:</span> {{ package.gitHubForks|number_format(0, '.', '&#8201;')|raw }}</p>{% endif %}
-                            {% if package.gitHubOpenIssues != null %}<p><span>Open Issues:</span> {{ package.gitHubOpenIssues|number_format(0, '.', '&#8201;')|raw }}</p>{% endif %}
+                            {% if package.gitHubWatches is not null %}<br>{% endif %}
+                            {% if package.language is not empty %}<p><span>Language:</span> {{ package.language }}</p>{% endif %}
+                            {% if package.gitHubStars is not null %}<p><span>Stars:</span> {{ package.gitHubStars|number_format(0, '.', '&#8201;')|raw }}</p>{% endif %}
+                            {% if package.gitHubWatches is not null %}<p><span>Watches:</span> {{ package.gitHubWatches|number_format(0, '.', '&#8201;')|raw }}</p>{% endif %}
+                            {% if package.gitHubForks is not null %}<p><span>Forks:</span> {{ package.gitHubForks|number_format(0, '.', '&#8201;')|raw }}</p>{% endif %}
+                            {% if package.gitHubOpenIssues is not null %}<p><span>Open Issues:</span> {{ package.gitHubOpenIssues|number_format(0, '.', '&#8201;')|raw }}</p>{% endif %}
                         </div>
                     </div>
                 </div>

+ 1 - 1
src/Packagist/WebBundle/Resources/views/macros.html.twig

@@ -10,7 +10,7 @@
                 <div class="col-xs-12 package-item">
                     <div class="row">
                         <div class="col-sm-9 col-lg-10">
-                            {% if package.language is defined and package.language != null %}<p class="pull-right language">{{ package.language }}</p>{% endif %}
+                            {% if package.language is defined and package.language is not empty %}<p class="pull-right language">{{ package.language }}</p>{% endif %}
                             <h4 class="font-bold">
                                 <a href="{{ packageUrl }}">{{ package.name }}</a>
                                 {% if package.id is not numeric %}