Merge pull request #339 from af83/5878-fix-ComplianceChecksController-show

2018-02-27T22:45:02+00:00

5878 Add ComplianceCheck#show

Fix prerequisite access for compliance_check and compliance_control Refs #5878 @1

2018-02-27T22:08:48+00:00

refs #5878; Remove hard link between a ComplianceCheck and the associated ComplianceControl

2018-02-27T15:30:40+00:00

Reorder route_stop_points when creating Chouette::StopPoint in route merge. Refs #6040

2018-02-27T11:13:23+00:00

Refs 5878; Add ComplianceCheck#show

2018-02-23T15:32:35+00:00

Add a spec to verify to Referential migration count after creation. Refs #6010

2018-02-22T18:18:26+00:00

VehicleJourney#in_purchase_window: Use table namespace in query

2018-02-22T16:11:48+00:00

We were getting this errorwhen filtering by purchase window on the
`ReferentialVehicleJourneys#index` page.

An example of a filter query that triggered the error:
http://stif-boiv.dev:3000/referentials/4/vehicle_journeys?utf8=✓&q[published_journey_name_or_objectid_cont]=&q[company_id_eq_any][]=&q[route_line_id_eq]=&q[published_journey_name_gteq]=&q[published_journey_name_lteq]=&q[stop_area_ids][]=&q[purchase_window][start_date(3i)]=12&q[purchase_window][start_date(2i)]=1&q[purchase_window][start_date(1i)]=2018&q[purchase_window][end_date(3i)]=15&q[purchase_window][end_date(2i)]=1&q[purchase_window][end_date(1i)]=2019&q[time_table][start_date(3i)]=&q[time_table][start_date(2i)]=&q[time_table][start_date(1i)]=&q[time_table][end_date(3i)]=&q[time_table][end_date(2i)]=&q[time_table][end_date(1i)]=&commit=Filtrer

    ActiveRecord::StatementInvalid in ReferentialVehicleJourneys#index

    Showing stif-boiv/app/views/referential_vehicle_journeys/_filters.html.slim where line #24 raised:

    PG::AmbiguousColumn: ERROR:  column reference "id" is ambiguous
    LINE 1: ...RE "vehicle_journeys"."journey_category" = 0 AND (id IN (SEL...
                                                                 ^
    : SELECT "public"."lines".* FROM "public"."lines" WHERE (id IN (SELECT  routes.line_id FROM "vehicle_journeys" INNER JOIN "routes" ON "routes"."id" = "vehicle_journeys"."route_id" WHERE "vehicle_journeys"."journey_category" = 0 AND (id IN (SELECT DISTINCT vehicle_journeys.id FROM "purchase_windows" INNER JOIN "purchase_windows_vehicle_journeys" ON "purchase_windows_vehicle_journeys"."purchase_window_id" = "purchase_windows"."id" INNER JOIN "vehicle_journeys" ON "vehicle_journeys"."id" = "purchase_windows_vehicle_journeys"."vehicle_journey_id" AND "vehicle_journeys"."journey_category" = 0 WHERE (daterange('2018-01-12', '2019-01-16') && any (date_ranges))))  ORDER BY "vehicle_journeys"."published_journey_name" ASC LIMIT 10 OFFSET 0))

    Extracted source (around line #24):

              class: 'control-label'
          .form-inline.filter_menu
            = f.input :route_line_id_eq,
                as: :select,
                include_blank: t(".all"),
                collection: @vehicle_journeys.lines,

    Trace of template inclusion: app/views/referential_vehicle_journeys/index.html.slim

We're trying to match `VehicleJourney`s here, so qualify the `id` column
with the table name to fix the error.

Refs #5943

Merge pull request #319 from af83/5609_slug_format

2018-02-22T09:58:12+00:00

Avoid problem with numeric in slug. Refs #5609

Keep original slug format (with _). Avoid full numeric slug. Refs #5609

2018-02-22T09:56:39+00:00

Move importers outputs in logs

2018-02-21T15:18:34+00:00

chouette-core/app/models, branch improve-referentials-overview