Merge pull request #1357 from sparc-request/ac-fix-accordion-sorting-…

…and-more-deprecation-warnings

Fix accordion sorting in both SPARCCatalog and SPARCRequest + remove deprecation warnings

app/controllers/catalog_manager/catalog_controller.rb

@@ -22,7 +22,7 @@ class CatalogManager::CatalogController < CatalogManager::AppController
   respond_to :js, :haml, :json
 
   def index
-    @institutions = Institution.order('`order`')
+    @institutions = Institution.order(Arel.sql('`order`,`name`'))
     @show_available_only = params[:show_available_only] ? params[:show_available_only] == "true" : true
 
     respond_to do |format|

app/controllers/catalog_manager/organizations_controller.rb

@@ -49,7 +49,7 @@ def update
       flash.now[:alert] = "Failed to update #{@organization.name}."
     end
 
-    @institutions = Institution.order('`order`')
+    @institutions = Institution.order(Arel.sql('`order`,`name`'))
 
     respond_to do |format|
       format.js

app/controllers/service_requests_controller.rb

@@ -76,7 +76,7 @@ def catalog
     if @sub_service_request
       @institutions = Institution.where(id: @sub_service_request.organization.parents.select{|x| x.type == 'Institution'}.map(&:id))
     else
-      @institutions = Institution.order('`order`')
+      @institutions = Institution.order(Arel.sql('`order`,`name`'))
     end
 
     setup_catalog_calendar

app/views/catalog_manager/catalog/_accordion.html.haml

@@ -38,7 +38,7 @@
             = link_to plus_glyphicon(), 'javascript:void(0)', data: { parent: ".institution-#{institution.id}" }
           .col-sm-11.no-padding-y
             = link_to create_new_text(:provider), 'javascript:void(0)', class: 'org-form-label panel-title'
-        - institution.providers.where(is_available: availability).order("`order`").each do |provider|
+        - institution.providers.where(is_available: availability).order(Arel.sql("`order`, `name`")).each do |provider|
           .panel-heading.no-padding-y
             .col-sm-1.no-padding-y
               = link_to folder_glyphicon(), 'javascript:void(0)', id: "provider-#{provider.id}", data: { toggle: 'collapse', target: "#provider-#{provider.id}-collapse", parent: "#institution-#{institution.id}" }
@@ -51,7 +51,7 @@
                   = link_to plus_glyphicon(), 'javascript:void(0)', data: { parent: ".provider-#{provider.id}" }
                 .col-sm-11.no-padding-y
                   = link_to create_new_text(:program), 'javascript:void(0)', class: 'org-form-label panel-title'
-              - provider.programs.where(is_available: availability).order("`order`").each do |program|
+              - provider.programs.where(is_available: availability).order(Arel.sql("`order`, `name`")).each do |program|
                 .panel-heading.no-padding-y
                   .col-sm-1.no-padding-y
                     = link_to folder_glyphicon(), 'javascript:void(0)', id: "program-#{program.id}", data: { toggle: 'collapse', target: "#program-#{program.id}-collapse", parent: "provider-#{provider.id}" }
@@ -69,7 +69,7 @@
                         = link_to plus_glyphicon(), 'javascript:void(0)', data: { parent: ".program-#{program.id}" }
                       .col-sm-11.no-padding-y
                         = link_to create_new_text(:service), 'javascript:void(0)', class: 'org-form-label panel-title'
-                    - program.cores.where(is_available: availability).order("`order`").each do |core|
+                    - program.cores.where(is_available: availability).order(Arel.sql("`order`, `name`")).each do |core|
                       .panel-heading.no-padding-y
                         .col-sm-1.no-padding-y
                           = link_to folder_glyphicon(), 'javascript:void(0)', id: "core-#{core.id}", data: { toggle: 'collapse', target: "#core-#{core.id}-collapse", parent: "program-#{program.id}" }
@@ -82,13 +82,13 @@
                               = link_to plus_glyphicon(), 'javascript:void(0)', data: { parent: ".core-#{core.id}" }
                             .col-sm-11.no-padding-y{style: "width:91%"}
                               = link_to create_new_text(:service), 'javascript:void(0)', class: 'org-form-label panel-title'
-                          - core.services.where(is_available: availability).order("`order`, `name`").each do |service|
+                          - core.services.where(is_available: availability).order(Arel.sql("`order`, `name`")).each do |service|
                             .panel-heading.no-padding-y
                               .col-sm-1.no-padding-y
                                 = link_to file_glyphicon(), edit_catalog_manager_service_path(service), id: "service-#{service.id}", data: { parent: "core-#{core.id}" }, remote: true
                               .col-sm-11.no-padding-y{style: "width:91%"}
                                 = link_to accordion_link_text(service), edit_catalog_manager_service_path(service), class: 'org-form-label panel-title', remote: true
-                    - program.services.where(is_available: availability).order("`order`, `name`").each do |service|
+                    - program.services.where(is_available: availability).order(Arel.sql("`order`, `name`")).each do |service|
                       .panel-heading.no-padding-y
                         .col-sm-1.no-padding-y
                           = link_to file_glyphicon(), edit_catalog_manager_service_path(service), id: "service-#{service.id}", data: { parent: "program-#{program.id}" }, remote: true

app/views/catalogs/_description.html.haml

@@ -28,7 +28,7 @@
     - if organization.type == "Program"
       - if organization.services.any? && (sub_service_request.nil? || process_ssr_found || organization.parents.include?(ssr_org))
         .program-services
-          = render 'catalogs/accordion/services', services: organization.services.order('`order`, `name`'), service_request: service_request, sub_service_request: sub_service_request
+          = render 'catalogs/accordion/services', services: organization.services.order(Arel.sql('`order`, `name`')), service_request: service_request, sub_service_request: sub_service_request
 
       - if organization.cores.any?
-        = render 'catalogs/accordion/cores', program: organization, cores: organization.cores.where(is_available: [nil, true]).order('`order`'), ssr_org: ssr_org, service_request: service_request, locked_ids: locked_org_ids, process_ssr_found: process_ssr_found, sub_service_request: sub_service_request
+        = render 'catalogs/accordion/cores', program: organization, cores: organization.cores.where(is_available: [nil, true]).order(Arel.sql('`order`,`name`')), ssr_org: ssr_org, service_request: service_request, locked_ids: locked_org_ids, process_ssr_found: process_ssr_found, sub_service_request: sub_service_request

app/views/catalogs/accordion/_institutions.html.haml

@@ -38,4 +38,4 @@
               %span.caret
       .panel-collapse.collapse.in{ class: "institution-#{i.id}" }
         .panel-body
-          = render 'catalogs/accordion/providers', providers: i.providers.where(is_available: [nil, true]).order('`order`'), locked_ids: locked_ids, ssr_org: ssr_org, institution_is_process_ssr: institution_is_process_ssr, i: i
+          = render 'catalogs/accordion/providers', providers: i.providers.where(is_available: [nil, true]).order(Arel.sql('`order`, `name`')), locked_ids: locked_ids, ssr_org: ssr_org, institution_is_process_ssr: institution_is_process_ssr, i: i

app/views/catalogs/accordion/_providers.html.haml

@@ -37,5 +37,5 @@
               %span.caret
       .panel-collapse.collapse{ class: "provider-#{p.id}" }
         .panel-body
-          = render 'catalogs/accordion/programs', programs: p.programs.where(is_available: [nil, true]).order('`order`'), locked_ids: locked_ids, ssr_org: ssr_org, provider_is_process_ssr: provider_is_process_ssr
+          = render 'catalogs/accordion/programs', programs: p.programs.where(is_available: [nil, true]).order(Arel.sql('`order`, `name`')), locked_ids: locked_ids, ssr_org: ssr_org, provider_is_process_ssr: provider_is_process_ssr
 

app/views/catalogs/accordion/_services.html.haml

@@ -17,7 +17,7 @@
 -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- services.order('`order`, `name`').includes(:pricing_maps).each do |service|
+- services.order(Arel.sql('`order`, `name`')).includes(:pricing_maps).each do |service|
   - # This was extracted from a helper and partial render to significantly increase efficiency
   - if [true, nil].include?(service.is_available) && service.current_pricing_map
     .service-view.full