github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-05 17:54:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix infinite loading spinner for badges that have not been granted yet.

Browse Source
This commit is contained in:
Vikhyat Korrapati 2014-04-18 09:10:18 +05:30
parent 8113e8d897
commit e6eb16ee73
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/routes/badges_show_route.js
View File

@ -18,6 +18,7 @@ Discourse.BadgesShowRoute = Ember.Route.extend({
setupController: function(controller, model) { setupController: function(controller, model) {
Discourse.UserBadge.findByBadgeId(model.get('id')).then(function(userBadges) { Discourse.UserBadge.findByBadgeId(model.get('id')).then(function(userBadges) {
controller.set('userBadges', userBadges); controller.set('userBadges', userBadges);
controller.set('userBadgesLoaded', true);
}); });
controller.set('model', model); controller.set('model', model);
} }

2
app/assets/javascripts/discourse/templates/badges/show.js.handlebars
View File

@ -22,6 +22,8 @@
{{/link-to}} {{/link-to}}
{{/each}} {{/each}}
{{else}} {{else}}
{{#unless userBadgesLoaded}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'>{{i18n loading}}</div>
{{/unless}}
{{/if}} {{/if}}
</div> </div>