glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rubocop

Browse source
This commit is contained in:
Devin Howard 2017-02-25 14:50:43 -08:00
parent 568a5cd0ed
commit dd8229512c
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/helpers/metacodes_helper.rb
View file

@ -23,14 +23,14 @@ module MetacodesHelper
Metacode.where(id: @m).to_a Metacode.where(id: @m).to_a
end end
focus_code = user_metacode() focus_code = user_metacode
if focus_code != nil && @metacodes.index{|m| m.id == focus_code.id} == nil if !focus_code.nil? && @metacodes.index { |m| m.id == focus_code.id }.nil?
@metacodes.push(focus_code) @metacodes.push(focus_code)
end end
@metacodes.sort! { |m1, m2| m2.name.downcase <=> m1.name.downcase } @metacodes.sort! { |m1, m2| m2.name.downcase <=> m1.name.downcase }
if focus_code != nil if !focus_code.nil?
@metacodes.rotate!(@metacodes.index { |m| m.id == focus_code.id }) @metacodes.rotate!(@metacodes.index { |m| m.id == focus_code.id })
else else
@metacodes.rotate!(-1) @metacodes.rotate!(-1)
@ -61,16 +61,16 @@ module MetacodesHelper
metacodes: user_most_used_metacodes metacodes: user_most_used_metacodes
.map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } } .map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } }
} }
metacode_sets += MetacodeSet.order("name").all.map do |set| metacode_sets += MetacodeSet.order('name').all.map do |set|
{ {
name: set.name, name: set.name,
metacodes: set.metacodes.order("name") metacodes: set.metacodes.order('name')
.map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } } .map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } }
} }
end end
metacode_sets << { metacode_sets << {
name: 'All', name: 'All',
metacodes: Metacode.order("name").all metacodes: Metacode.order('name').all
.map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } } .map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } }
} }
metacode_sets.to_json metacode_sets.to_json