From 2905245f1ab72d52494b26f7e5a89ed1d7f1f490 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Wed, 19 Feb 2014 04:40:37 +0000
Subject: [PATCH] * VRFS-1181 - upright bass in the mix

---
 db/manifest                           | 3 ++-
 db/up/add_upright_bass.sql            | 1 +
 web/app/assets/javascripts/globals.js | 2 ++
 web/app/assets/javascripts/utils.js   | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 db/up/add_upright_bass.sql

diff --git a/db/manifest b/db/manifest
index bbef9cfb3..def0d818f 100755
--- a/db/manifest
+++ b/db/manifest
@@ -112,4 +112,5 @@ like_follower_poly_assoc.sql
 feed_use_recording.sql
 feed_autoincrement_primary_key.sql
 music_sessions_plays.sql
-plays_likes_counters.sql
\ No newline at end of file
+plays_likes_counters.sql
+add_upright_bass.sql
\ No newline at end of file
diff --git a/db/up/add_upright_bass.sql b/db/up/add_upright_bass.sql
new file mode 100644
index 000000000..30cb9f0c8
--- /dev/null
+++ b/db/up/add_upright_bass.sql
@@ -0,0 +1 @@
+INSERT INTO instruments (id, description, popularity) VALUES ('upright bass', 'Upright Bass', 2);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/globals.js b/web/app/assets/javascripts/globals.js
index eac7e2507..49341c071 100644
--- a/web/app/assets/javascripts/globals.js
+++ b/web/app/assets/javascripts/globals.js
@@ -25,6 +25,7 @@
         "Electric Guitar": { "client_id": 50, "server_id": "electric guitar" },
         "Keyboard": { "client_id": 60, "server_id": "keyboard" },
         "Piano": { "client_id": 61, "server_id": "piano" },
+        "Upright Bass": { "client_id": 62, "server_id": "upright bass" },
         "Voice": { "client_id": 70, "server_id": "voice" },
         "Flute": { "client_id": 80, "server_id": "flute" },
         "Clarinet": { "client_id": 90, "server_id": "clarinet" },
@@ -54,6 +55,7 @@
         50: { "server_id": "electric guitar" },
         60: { "server_id": "keyboard" },
         61: { "server_id": "piano"} ,
+        62: { "server_id": "upright bass"} ,
         70: { "server_id": "voice" },
         80: { "server_id": "flute" },
         90: { "server_id": "clarinet" },
diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js
index 0acd6f9cb..1d77bca84 100644
--- a/web/app/assets/javascripts/utils.js
+++ b/web/app/assets/javascripts/utils.js
@@ -56,15 +56,16 @@
         "french horn":"french_horn",
         "harmonica":"harmonica",
         "keyboard":"keyboard",
-        "piano":"keyboard",
         "mandolin":"mandolin",
         "oboe":"oboe",
         "other":"other",
+        "piano":"keyboard",
         "saxophone":"saxophone",
         "trombone":"trombone",
         "trumpet":"trumpet",
         "tuba":"tuba",
         "ukulele":"ukelele",
+        "upright bass":"cello",
         "viola":"viola",
         "violin":"violin",
         "voice":"voice"