IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: keep correct ordering on admin badges

Browse Source
This commit is contained in:
Sam 2014-07-30 08:35:15 +10:00
parent b196de0821
commit 5a3466a6c3
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/badges_controller.rb
View File

@ -4,7 +4,9 @@ class Admin::BadgesController < Admin::AdminController
data = { data = {
badge_types: BadgeType.all.order(:id).to_a, badge_types: BadgeType.all.order(:id).to_a,
badge_groupings: BadgeGrouping.all.order(:position).to_a, badge_groupings: BadgeGrouping.all.order(:position).to_a,
badges: Badge.all.to_a, badges: Badge.includes(:badge_grouping)
.references(:badge_grouping)
.order('badge_groupings.position, badge_type_id, badges.name').to_a,
protected_system_fields: Badge.protected_system_fields, protected_system_fields: Badge.protected_system_fields,
triggers: Badge.trigger_hash triggers: Badge.trigger_hash
} }

7
spec/controllers/admin/badges_controller_spec.rb
View File

@ -6,6 +6,13 @@ describe Admin::BadgesController do
let!(:user) { log_in(:admin) } let!(:user) { log_in(:admin) }
let!(:badge) { Fabricate(:badge) } let!(:badge) { Fabricate(:badge) }
context 'index' do
it 'returns badge index' do
xhr :get, :index
response.should be_success
end
end
context '.save_badge_groupings' do context '.save_badge_groupings' do
it 'can save badge groupings' do it 'can save badge groupings' do