aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-02-27Refs #5878; Refactor ComplianceChecksControllerZog
Use InheritedResources helpers
2018-02-27refs #5878; Remove hard link between a ComplianceCheck and the associated ↵Zog
ComplianceControl
2018-02-27Refs #6008; Use same time for arrival & departure in 1st and last stops6008-no-transition-time-for-journeys-start-and-endZog
2018-02-27Merge pull request #321 from af83/5979_change_export_csv_filenamesLuc Donnet
Refs #5979 Change export CSV filenames to have a readable date in it
2018-02-27Refs #6039; Display '+' when a delta is > 996039-handle-long-delats-in-vj-editorZog
2018-02-27Refs #6063; Fix the journeys time editor6036-fix-journeys-editorZog
2018-02-27Merge pull request #320 from af83/5882_ccset_code_filterLuc Donnet
Refs #5882 Fix CC name and code filter
2018-02-27Merge pull request #340 from ↵Luc Donnet
af83/5950_allow_user_to_see_ccset_from_other_organisation Refs #5950 Fix 404 error when user wants to see CCSet from other orga…
2018-02-27Merge pull request #345 from af83/6026-dedicated-env-for-seedsLuc Donnet
6026 Use SEED_ENV in seedbank, fallback on Rails.env
2018-02-27Don't use all compliance_control_set from stif organisation. We will use ↵5950_allow_user_to_see_ccset_from_other_organisationLuc Donnet
later compliance_control_set selected by stif organisatoon Refs #5950 @2
2018-02-27Refs #6026; Fix duplicated seeds tasks6026-dedicated-env-for-seedsZog
2018-02-27Small css fix on referential overviewsZog
2018-02-27Fix breadcrumb on merges controllerZog
2018-02-27Reorder route_stop_points when creating Chouette::StopPoint in route merge. ↵Alban Peignier
Refs #6040
2018-02-26Refs #6026; Use SEED_ENV in seedbank, fallback on Rails.envZog
2018-02-26Refs #5896; Add cahe-related headers for assetsZog
2018-02-26Fix specsZog
2018-02-26CR #1Zog
2018-02-26Add a validation mechanismZog
2018-02-26Propose some improvements on CustomFieldsZog
2018-02-23Refs #5950 Fix 404 error when user wants to see CCSet from other organisation :cedricnjanga
- remove begin_association_chain in controller - Change collecyion to only see user organisayion CCSet and STIF CCSet - add policy for show action
2018-02-23Refs 5878; Add ComplianceCheck#showZog
2018-02-23Refs #5952; Add an hysteresis on the sticky headerZog
2018-02-23Refs #5982; Show error in VJ creation modal when no JP is selectedZog
2018-02-23Fix small bug on referential overviewZog
2018-02-23Hide opposite routesZog
2018-02-23Better UI for maps showing mltiple routesZog
2018-02-23Refs #5927 @1h; Add a BOM at the beginning of CSVs5927-add-bom-header-to-exported-csvZog
In the exported csv, add a BOM at the beginning to tell Excdel we use UTF-8
2018-02-22Don't load activerecord-nulldb-adapter if RAILS_DB_ADAPTER isn't nulldb. ↵Alban Peignier
Refs #6010
2018-02-22Add a spec to verify to Referential migration count after creation. Refs #6010Alban Peignier
2018-02-22Merge pull request #333 from ↵Alban Peignier
af83/5943-referential-vehicle_journeys-index--query-error-when-fi VehicleJourney#in_purchase_window: Use table namespace in query. Refs #5943
2018-02-22VehicleJourney#in_purchase_window: Use table namespace in queryTeddy Wing
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
2018-02-22Return false in has_feature? when no organisation is defined. Refs #6007Alban Peignier
2018-02-22TypoZog
2018-02-22Merge pull request #330 from af83/5993-enhance-detailed-calendarAlban Peignier
Homogenize calendars display. Refs #5993
2018-02-22Ignore not ready Referentials in apartment tenant names. Refs #6004Alban Peignier
2018-02-22Merge pull request #331 from af83/5938-locale-selectorAlban Peignier
Add a locale selector menu item. Refs #5398
2018-02-22Prevent error when PunditViewPolicy try to find undefined features5938-locale-selectorAlban Peignier
2018-02-22Test feature :change_locale to display language switch. Refs #5938Alban Peignier
2018-02-22Refs #5398; Add a locale selector menu itemZog
2018-02-22Merge pull request #329 from af83/5995-update-display-on-vjs-indexAlban Peignier
Change ReferentialVJs#index when filtered by stops. Refs #5995. Refs #5996. Refs #5852
2018-02-22Remove phantom objectid extension5995-update-display-on-vjs-indexAlban Peignier
2018-02-22Use local time in ReferentialVJs#index. Enable sort on times in ↵Alban Peignier
ReferentialVehicleJourneys#index. Refs #5996. Refs #5852
2018-02-22Merge pull request #319 from af83/5609_slug_formatAlban Peignier
Avoid problem with numeric in slug. Refs #5609
2018-02-22Keep original slug format (with _). Avoid full numeric slug. Refs #56095609_slug_formatAlban Peignier
2018-02-22Refs #5993; Homogenize calendars display5993-enhance-detailed-calendarZog
2018-02-22Merge pull request #324 from af83/5942-apply-user-tzAlban Peignier
Apply user tz. Refs #5942
2018-02-22Refs #5995; Add extra columns on ReferentialVJs#index when filtered by stopsZog
2018-02-22WorkbenchImportWorker: Use `File.unlink` instead of `#unlink`Teddy Wing
I was getting this error when I removed the `rescue nil`s: Failures: 1) WorkbenchImportWorker foreign lines uploads the following entries: ["OFFRE_TRANSDEV_20170301122517", "OFFRE_TRANSDEV_20170301122519"] Failure/Error: eg_file.unlink NoMethodError: undefined method `unlink' for #<File:0x007fef1adbace8> # ./app/workers/workbench_import_worker.rb:81:in `upload_entry_group_stream' # ./app/workers/workbench_import_worker.rb:52:in `upload_entry_group' # ./app/services/zip_service.rb:61:in `<<' # ./app/services/zip_service.rb:61:in `finish_current_output' # ./app/services/zip_service.rb:35:in `add_entry' # ./app/services/zip_service.rb:27:in `block in _subdirs' # .../.gem/ruby/2.3.3/gems/rubyzip-1.2.1/lib/zip/entry_set.rb:38:in `block in each' # .../.gem/ruby/2.3.3/gems/rubyzip-1.2.1/lib/zip/entry_set.rb:37:in `each' # .../.gem/ruby/2.3.3/gems/rubyzip-1.2.1/lib/zip/entry_set.rb:37:in `each' # .../.gem/ruby/2.3.3/gems/rubyzip-1.2.1/lib/zip/central_directory.rb:182:in `each' # ./app/services/zip_service.rb:26:in `_subdirs' # .../.gem/ruby/2.3.3/gems/rubyzip-1.2.1/lib/zip/file.rb:133:in `open_buffer' # ./app/services/zip_service.rb:21:in `block in subdirs' # ./app/workers/workbench_import_worker.rb:39:in `each' # ./app/workers/workbench_import_worker.rb:39:in `each_with_index' # ./app/workers/workbench_import_worker.rb:39:in `upload' # ./app/workers/workbench_import_worker.rb:19:in `perform' # ./spec/workers/workbench_import_worker_spec.rb:68:in `block (4 levels) in <top (required)>' # ./spec/workers/workbench_import_worker_spec.rb:68:in `block (3 levels) in <top (required)>' # ./spec/workers/workbench_import_worker_spec.rb:13:in `instance_eval' # ./spec/workers/workbench_import_worker_spec.rb:13:in `block in expect_upload_with' # .../.gem/ruby/2.3.3/gems/activesupport-4.2.8/lib/active_support/dependencies.rb:268:in `load' # .../.gem/ruby/2.3.3/gems/activesupport-4.2.8/lib/active_support/dependencies.rb:268:in `block in load' # .../.gem/ruby/2.3.3/gems/activesupport-4.2.8/lib/active_support/dependencies.rb:240:in `load_dependency' # .../.gem/ruby/2.3.3/gems/activesupport-4.2.8/lib/active_support/dependencies.rb:268:in `load' # .../.gem/ruby/2.3.3/gems/spring-commands-rspec-1.0.4/lib/spring/commands/rspec.rb:18:in `call' # -e:1:in `<main>' Johan said that in his tests on his local machine, the temp files weren't getting deleted. When I try running the specs, the temp files do get deleted, so not sure what was going on. Figure it may be because of the `rescue nil`s, so I decided to remove those in the hopes of always ensuring we close and unlink the temp files. The trouble with doing that, however, was that it caused the error and thus test failures like the example above. I managed to fix the problem by using `File.unlink` instead of the instance method. Hopefully this works to ensure that the temp files are always deleted. Refs #4315
2018-02-22WorkbenchImportWorker: Reinstate creation of `./tmp/imports`Teddy Wing
If the directory doesn't exist, we should create it to ensure we don't get errors trying to write to a location that doesn't exist. I had removed this because I assumed the dir would be created during deployment, but I guess I shouldn't assume. Also, we want to ensure the dir gets created on dev machines without errors. This line is updated from last time where we'd create `Rails.root.join('tmp', 'imports')`. Now we use our `#temp_directory`, which can be variable. Refs #4315
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-23 22:47:07 +0000