github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-25 16:48:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: link to filtered badge list from notification

Browse Source 
When notified on a badge link to the badge page filtered on username
This commit is contained in:
Sam 2016-01-18 18:20:16 +11:00
parent ca3e2b4da3
commit e6c1f1db52
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/notification-item.js.es6
View File

@ -29,7 +29,9 @@ export default Ember.Component.extend({
badgeSlug = badgeName.replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase(); badgeSlug = badgeName.replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase();
} }
return Discourse.getURL('/badges/' + badgeId + '/' + badgeSlug); var username = it.get('data.username');
username = username ? "?username=" + username.toLowerCase() : "";
return Discourse.getURL('/badges/' + badgeId + '/' + badgeSlug + username);
} }
const topicId = it.get('topic_id'); const topicId = it.get('topic_id');

2
app/services/badge_granter.rb
View File

@ -44,7 +44,7 @@ class BadgeGranter
I18n.with_locale(@user.effective_locale) do I18n.with_locale(@user.effective_locale) do
notification = @user.notifications.create( notification = @user.notifications.create(
notification_type: Notification.types[:granted_badge], notification_type: Notification.types[:granted_badge],
data: { badge_id: @badge.id, badge_name: @badge.display_name, badge_slug: @badge.slug }.to_json) data: { badge_id: @badge.id, badge_name: @badge.display_name, badge_slug: @badge.slug, username: @user.username}.to_json)
user_badge.update_attributes notification_id: notification.id user_badge.update_attributes notification_id: notification.id
end end
end end