From 7ea80fa26f537e50403ed1465f57ff27ff501612 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 5 Dec 2016 09:00:49 -0600
Subject: [PATCH] default to default samplerate

---
 admin/app/admin/jamblaster.rb                 | 26 ++++++++++++++++++-
 .../wizard/gear/step_select_gear.js           |  2 ++
 .../assets/javascripts/wizard/sample_rate.js  |  5 +++-
 .../stylesheets/client/wizard/gearWizard.scss |  2 +-
 .../controllers/vanilla_forums_controller.rb  |  2 +-
 .../clients/wizard/_sample_rate.html.slim     |  1 +
 6 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/admin/app/admin/jamblaster.rb b/admin/app/admin/jamblaster.rb
index d64666711..83fdb5640 100644
--- a/admin/app/admin/jamblaster.rb
+++ b/admin/app/admin/jamblaster.rb
@@ -1,8 +1,11 @@
-ActiveAdmin.register  JamRuby::Jamblaster, :as => 'Jamblaster' do
+ActiveAdmin.register JamRuby::Jamblaster, :as => 'Jamblaster' do
 
 
   menu :label => 'JamBlasters', :parent => 'JamBlaster'
 
+  scope("Connected", default: true) { |scope| scope.where('client_id in (select client_id from connections)').where("serial_no != 'false'") }
+  scope("All") { |scope| scope.order('created_at desc') }
+
   form do |f|
     f.inputs 'New JamBlaster' do
       f.input :user, required: true, collection: User.all, include_blank: false
@@ -12,4 +15,25 @@ ActiveAdmin.register  JamRuby::Jamblaster, :as => 'Jamblaster' do
     end
     f.actions
   end
+
+
+  index do
+
+    # actions # use this for all view/edit/delete links
+
+    column 'Serial' do |oo|
+      oo.serial_no
+    end
+
+    column 'IPv4' do |oo|
+      oo.ipv4_link_local
+    end
+
+    column 'IPv6' do |oo|
+      oo.ipv6_link_local
+    end
+
+  end
+
+
 end
diff --git a/web/app/assets/javascripts/wizard/gear/step_select_gear.js b/web/app/assets/javascripts/wizard/gear/step_select_gear.js
index a73274ab4..3d3187bed 100644
--- a/web/app/assets/javascripts/wizard/gear/step_select_gear.js
+++ b/web/app/assets/javascripts/wizard/gear/step_select_gear.js
@@ -867,6 +867,8 @@
         else {
           var inputSampleRate = 44100;
         }
+        // ignore all this; just set it to
+        inputSampleRate = 'DEVICE_DEFAULT'
         logger.debug("applying the sample rate based on input device: " + selectedDeviceInfo.input.id + " (" + inputSampleRate + ")");
         sampleRate.selectSampleRate(inputSampleRate);
         context.jamClient.FTUESetPreferredMixerSampleRate(sampleRate.selectedSampleRate());
diff --git a/web/app/assets/javascripts/wizard/sample_rate.js b/web/app/assets/javascripts/wizard/sample_rate.js
index 2a828ff14..e59ef403c 100644
--- a/web/app/assets/javascripts/wizard/sample_rate.js
+++ b/web/app/assets/javascripts/wizard/sample_rate.js
@@ -46,6 +46,9 @@
       else if(value == 96000) {
         setter = 'PREFER_96'
       }
+      else if (value == 'DEVICE_DEFAULT') {
+        setter = 'USE_DEVICE_DEFAULT_SR'
+      }
       console.log("SELECT SAMPLE RATE" + value, setter);
       context.JK.dropdown($sampleRate.val(setter).easyDropDown('select', setter.toString(), true))
     }
@@ -63,7 +66,7 @@
     }
 
     function resetValues() {
-      $sampleRate.val('PREFER_44').easyDropDown('select', 'PREFER_44', true)
+      $sampleRate.val('USE_DEVICE_DEFAULT_SR').easyDropDown('select', 'USE_DEVICE_DEFAULT_SR', true)
 
     }
 
diff --git a/web/app/assets/stylesheets/client/wizard/gearWizard.scss b/web/app/assets/stylesheets/client/wizard/gearWizard.scss
index a9f52c02d..b84fb7f5c 100644
--- a/web/app/assets/stylesheets/client/wizard/gearWizard.scss
+++ b/web/app/assets/stylesheets/client/wizard/gearWizard.scss
@@ -723,7 +723,7 @@
     }
     .easydropdown-wrapper {
       width:auto;
-      float:right;
+      float:left;
     }
   }
 
diff --git a/web/app/controllers/vanilla_forums_controller.rb b/web/app/controllers/vanilla_forums_controller.rb
index 09733b288..2f16d3feb 100644
--- a/web/app/controllers/vanilla_forums_controller.rb
+++ b/web/app/controllers/vanilla_forums_controller.rb
@@ -52,7 +52,7 @@ class VanillaForumsController < ApplicationController
 
 
     render :json => JsConnect::getJsConnectString(user, request,
-                                                  Rails.application.config.vanilla_client_id, Rails.application.config.vanilla_secret)
+                                                  Rails.application.config.vanilla_client_id, Rails.application.config.vanilla_secret), :content_type => 'application/javascript'
 
   end
 
diff --git a/web/app/views/clients/wizard/_sample_rate.html.slim b/web/app/views/clients/wizard/_sample_rate.html.slim
index 48ffd7341..f48ecf7d7 100644
--- a/web/app/views/clients/wizard/_sample_rate.html.slim
+++ b/web/app/views/clients/wizard/_sample_rate.html.slim
@@ -1,4 +1,5 @@
 select.select-sample-rate
+  option value='USE_DEVICE_DEFAULT_SR' Match
   option value='PREFER_44' 44100
   option value='PREFER_48' 48000
   option value='PREFER_96' 96000
\ No newline at end of file