[BUG] Remove unscoped library_locations calls and replace default sco…

…pe with specified sort order

app/controllers/admin/library_locations_controller.rb

@@ -1,7 +1,7 @@
 module Admin
   class LibraryLocationsController < BaseController
     def index
-      @library_locations = current_organization.library_locations.unscoped.order(:sort_order)
+      @library_locations = current_organization.library_locations
       render layout: "admin/base_with_sidebar"
     end
 

app/models/contact.rb

@@ -1,3 +1,20 @@
+# == Schema Information
+#
+# Table name: contacts
+#
+#  id           :integer          not null, primary key
+#  first_name   :string(30)       not null
+#  last_name    :string(30)       not null
+#  organization :string(50)       not null
+#  city         :string(30)       not null
+#  state        :string(2)        not null
+#  email        :string(30)       not null
+#  phone        :string(20)
+#  comments     :text             not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+
 class Contact < ActiveRecord::Base
   validates :first_name, presence: true, length: { maximum: 30 }
   validates :last_name, presence: true, length: { maximum: 30 }

app/models/library_location.rb

@@ -8,11 +8,12 @@
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  organization_id :integer
+#  sort_order      :integer          default(0)
 #
 
 class LibraryLocation < ActiveRecord::Base
   belongs_to :organization
   validates :name, :zipcode, presence: true
 
-  default_scope { order(:name) }
+  default_scope { order(:sort_order) }
 end

app/models/user.rb

@@ -42,6 +42,7 @@
 #  date_of_birth          :datetime
 #  grade                  :integer
 #  quiz_responses_object  :text
+#  program_id             :integer
 #
 
 class User < ActiveRecord::Base

app/views/devise/registrations/_new.html.erb

@@ -34,7 +34,7 @@
       <% if current_organization.branches? && current_organization.library_locations.present? %>
         <div class="form-group">
           <%= label_tag "chzn", "Select Your Library", class: "screen-reader-text" %>
-          <%= p.collection_select(:library_location_id, current_organization.library_locations.unscoped.order(:sort_order),
+          <%= p.collection_select(:library_location_id, current_organization.library_locations,
               :id, "name", { include_blank: "#{t('login_signup.your_library')}" },
               class: "select-large", id: "chzn" ) %>
         </div>

config/deploy/staging.rb

@@ -1,6 +1,6 @@
 set :bundle_without, %w{production test}.join(" ")
 
-set :branch, "release-2.6.1"
+set :branch, "release-2.6.2"
 
 server "dl-stageapp-01.do.lark-it.com",
   user: fetch(:application),