Commit 770d0c1b authored by Bruno Freitas Tissei's avatar Bruno Freitas Tissei

Merge branch 'hotfix_issue_129' into 'master'

Fix service type order
Signed-off-by: Bruno Freitas Tissei's avatarBruno Freitas Tissei <bft15@inf.ufpr.br>

See merge request !239
parents c98d67e6 1c8638ce
......@@ -362,10 +362,10 @@ class ProfessionalsController < ApplicationController
def shifts
#TODO Tem que fazer [by Fabricio]
if @currentProfessionalServicePlace.role == "adm_c3sl"
@service_places_professionals = ServiceType.all.order(:description)
@service_places_professionals = ServiceType.all.order('description ASC')
else
ids = ServiceTypeServicePlace.where(service_place_id: @currentProfessionalServicePlace.service_place.id).pluck(:service_type_id)
@service_places_professionals = ServiceType.where(id: ids)
@service_places_professionals = ServiceType.where(id: ids).order('description ASC')
end
if session[:carrega_pagina]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment