Commit 8af75b72 authored by Pedro Henrique's avatar Pedro Henrique

Merge branch 'Issue#132' into 'master'

Issue#132

See merge request !233
parents e83dc4ca e2deaa00
......@@ -669,7 +669,7 @@ class ReportsController < ApplicationController
@link2 = "Atendimentos"
if !current_citizen.professional.administradorsistema?
@serviceplaces = ServicePlace.where(:city_hall_id => @currentCityHall.id)
@serviceplaces = ServicePlace.all.where(:city_hall_id => @currentCityHall.id, :id => @currentProfessionalServicePlace.service_place_id).order('name ASC')
@professionals = Professional.active.hide_c3sl_user.where(service_places: {city_hall_id: @currentCityHall.id}).includes(:service_places)
else
@serviceplaces = ServicePlace.all
......
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