diff options
| author | Alban Peignier | 2018-01-02 12:08:40 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-02 12:08:40 +0100 |
| commit | 95a9f7f71f11975f745a3623842e7aea7e50398d (patch) | |
| tree | a294da5a15cd7f0aee79544965e701aafbe187f2 | |
| parent | ab48fee5d8540e839a29abb9c196303ff7a2e9af (diff) | |
| parent | 4857aad7f4cbbdef7ab1d0596fe4712930476ef9 (diff) | |
| download | chouette-core-95a9f7f71f11975f745a3623842e7aea7e50398d.tar.bz2 | |
Merge pull request #193 from af83/fix-routes-editor
Prevent a n+1 query in VehicleJourney#index
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 2 | ||||
| -rw-r--r-- | app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 7434c777f..c03db0c7f 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -49,7 +49,7 @@ class VehicleJourneysController < ChouetteController end format.html do @stop_points_list = [] - @stop_points_list = route.stop_points.joins(:stop_area).map do |sp| + @stop_points_list = route.stop_points.includes(:stop_area).map do |sp| { :id => sp.stop_area.id, :route_id => sp.try(:route_id), diff --git a/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js index 56f80ebb5..fdaa5aeed 100644 --- a/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js +++ b/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js @@ -66,7 +66,12 @@ export default class TimetablesEditVehicleJourney extends Component { {this.props.modal.modalProps.timetables.map((tt, i) => <div className='nested-fields' key={i}> <div className='wrapper'> - <div> <a href={this.timeTableURL(tt)} target="_blank">{tt.comment}</a> </div> + <div> + <a href={this.timeTableURL(tt)} target="_blank"> + <span className="fa fa-circle mr-xs" style={{color: tt.color || 'black'}}></span> + {tt.comment} + </a> + </div> { this.props.editMode && <div> |