Merge branch 'develop' into feature/jamtracks_enhancements

ruby/lib/jam_ruby/jam_track_importer.rb

@@ -2868,6 +2868,17 @@ module JamRuby
         end
       end
 
+      def import_count_exceeded?(count)
+        max = ENV['MAX_TRACKS']
+        begin
+          if Integer(max) <= count
+            return true
+          end
+        rescue
+        end
+        return false
+      end
+
       def synchronize_all(options)
         importers = []
 
@@ -2883,9 +2894,10 @@ module JamRuby
             count+=1
           end
 
-          if count > 500
+          if import_count_exceeded?(count)
-            #break
+            break
           end
+
         end
 
 

web/config/initializers/dev_users.rb

@@ -5,7 +5,7 @@ if Rails.env == "development" && Rails.application.config.bootstrap_dev_users
 
       # create one user per employee, +1 for peter2 because he asked for it
       User.create_dev_user("Seth", "Call", "seth@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_seth.jpg')
-      User.create_dev_user("Brian", "Smith", "briansmith@jamkazam.com", "jam123", "Apex", "NC", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_brian.jpg')
+      User.create_dev_user("Brian", "Smith", "brian@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_brian.jpg')
       User.create_dev_user("Peter", "Walker", "peter@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_peter.jpg')
       User.create_dev_user("Peter", "Walker", "peter2@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_peter.jpg')
       User.create_dev_user("David", "Wilson", "david@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_david.jpg')