Commit bfe31f08 authored by Mateus Ravedutti's avatar Mateus Ravedutti

Fix conflict issue

parent e83dc4ca
......@@ -125,16 +125,13 @@ class SchedulesController < ApplicationController
elsif @currentProfessionalServicePlace.role == "adm_prefeitura"
# As adm_prefeitura
# Get all active sectors of its city hall
<<<<<<< HEAD
@sectors = @currentCityHall.sectors.active.order('name ASC')
=======
if(@citizen != nil)
@city_hall_id = CityHall.active.where(city_id: @citizen.city.id).first.id
@sectors = Sector.active.where(city_hall_id: @city_hall_id)
else
@sector = Sector.active
end
>>>>>>> Issue_112
# Get all active service places of its city hall
@city_service_places = @currentCityHall.service_places.active
# Get all active service types of its city hall
......
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