From d5d5760d295e49915a4037473ac187b043840b6e Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 2 Oct 2016 16:47:43 -0400 Subject: [PATCH] enable most used and recent in all metacode select situations --- app/helpers/application_helper.rb | 19 +++++++- app/views/shared/_metacodeoptions.html.erb | 4 +- app/views/shared/_switchmetacodes.html.erb | 54 ++++++++++++++++++++-- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1c9b4da5..03cbfbf4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3,13 +3,22 @@ module ApplicationHelper def metacodeset metacodes = current_user.settings.metacodes return false unless metacodes[0].include?('metacodeset') + if metacodes[0].sub('metacodeset-', '') == 'Most' + return 'Most' + elsif metacodes[0].sub('metacodeset-', '') == 'Recent' + return 'Recent' + end MetacodeSet.find(metacodes[0].sub('metacodeset-', '').to_i) end def user_metacodes @m = current_user.settings.metacodes set = metacodeset - @metacodes = if set + @metacodes = if set && set == 'Most' + Metacode.where(id: current_user.mostUsedMetacodes).to_a + elsif set && set == 'Recent' + Metacode.where(id: current_user.recentMetacodes).to_a + elsif set set.metacodes.to_a else Metacode.where(id: @m).to_a @@ -17,6 +26,14 @@ module ApplicationHelper @metacodes.sort! { |m1, m2| m2.name.downcase <=> m1.name.downcase }.rotate!(-1) end + def user_most_used_metacodes + @metacodes = current_user.mostUsedMetacodes.map { |id| Metacode.find(id) } + end + + def user_recent_metacodes + @metacodes = current_user.recentMetacodes.map { |id| Metacode.find(id) } + end + def invite_link "#{request.base_url}/join" + (current_user ? "?code=#{current_user.code}" : '') end diff --git a/app/views/shared/_metacodeoptions.html.erb b/app/views/shared/_metacodeoptions.html.erb index 637a42a3..3ea915b2 100644 --- a/app/views/shared/_metacodeoptions.html.erb +++ b/app/views/shared/_metacodeoptions.html.erb @@ -9,7 +9,7 @@ Most Used