aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
AgeCommit message (Collapse)Author
2018-05-28Merge pull request #580 from af83/7031-fox-consolidated-viewLuc Donnet
7031 Css fixes on Consolidated view
2018-05-28Refs #6433 Use ransackable scope for stop area status filtercedricnjanga
2018-05-28Refs #6433 Add changes to stop areas status filtercedricnjanga
2018-05-23Refs #7004 Lower params[:sort] to avoid sort bugscedricnjanga
2018-05-17Refs #7031; Page loading optimizationsZog
2018-05-15Fix import separator for dates in import and compliance_check resource ↵Luc Donnet
filename Refs #6949 @1
2018-05-15Merge pull request #557 from af83/6949-compliance-check-set-csv-export-filenameLuc Donnet
Refs #Adapt CCSet CSV export filename to app language
2018-05-15Fix filename for compliance_check resource Refs #6949 @16949-compliance-check-set-csv-export-filenameLuc Donnet
2018-05-15Merge pull request #556 from af83/6950-import-csv-export-filenameLuc Donnet
Refs #6950 Adapt import CSV export filename to app language
2018-05-15Fix filename for import resource Refs #6950 @16950-import-csv-export-filenameLuc Donnet
2018-05-10Merge pull request #555 from af83/6923-consolidated-offerAlban Peignier
Display consolidated offer. Fixes #6923
2018-05-09Use Workbench#compliance_control_set_ids virtual attribute to merge with ↵Alban Peignier
existing owner_compliance_control_set_ids. Refs #6960
2018-05-09Rewrite compliance_control_sets associated to workbench or workgroup edits ↵Alban Peignier
and imports. Refs #6960
2018-05-09Refs #6961; Update Workbench#editZog
- Update the form - Use policies and update the seeds accordingly - Add a link in the navbar(s)
2018-05-07Refs #6960; Add a view to set the controls associated to each workbenchZog
2018-05-07Refs #Adapt CCSet CSV export filename to app languagecedricnjanga
2018-05-07Refs #6950 Adapt import CSV export filename to app languagecedricnjanga
2018-05-07Trigger compliance checks after importsZog
2018-05-07Rework imports to use Resources and make the a little more verboseZog
2018-05-04Refs #6923; Implement a consolidated viewZog
2018-05-02Refs #6572; Crete Referentials in a pending stateZog
And fix a bug preventing the deletion of referentials without a schema
2018-04-27Refs #6572; Fix referentials policiesZog
2018-04-27Refs #6572; Update filters on referentials listZog
2018-04-27Refs #6572; New Referential#Show for noredy referentialsZog
2018-04-26AutocompleteLinesController: Don't error if no `q` param is passedTeddy Wing
Previously the action would respond with a 500 error if no `q` parameter was given in the request. Instead, respond with a 200 and fix the error that occurs as a result of assuming that `params[:q]` exists in `AutocompleteLinesController#collection`. Refs #5889
2018-04-26ReferentialVehicleJourneys: Use display name in line filter drop-downTeddy Wing
Previously we had been showing the `name` field for the initial value of an already selected line. However, that doesn't show all the information that's normally given in the drop-down options. We instead have to use the `#display_name` method to get the full display that people are used to seeing in the drop-down. This also means we can no longer `pluck`, as more fields are required to assemble the display name. Instead, just do a simple `find` for the record. Refs #5889
2018-04-26ReferentialVehicleJourneys: Show selected line in drop-downTeddy Wing
Previously we weren't showing the currently-selected line filter in the drop-down label. If a line is selected, get its ID and name and use those to pre-fill the select. Using Select2's `initSelection` option to configure this instead of putting `selected: ` in the Rails field definition. That would have looked like this: collection: [[@filtered_line.name, @filtered_line.id]], selected: params[:q] && params[:q][:route_line_id_eq], But doing it that way wasn't possible because this is an AJAX-populated Select2. Since we already have a way to use `initSelection`, this was the quickest and easiest way to go, but apparently Select2 v4.0 deprecated this option, instead doing it with a data adapter. Couldn't really be bothered right now to figure out how to set that up as it seemed like a lot of work for not much payoff right now. Also, I was a little disappointed in Select2's docs regarding this. From what I understood, it looks like you basically need to create your own custom data adapter to do this, which sounds like a pain, and I'm not sure if I would have to mess with the rest of our existing Select2 configuration setup in order to integrate that. Refs #5889
2018-04-25Refs #6620; Show 'chrono' icon in computed journeysZog
2018-04-25Refs #6669; Revert WorkaroundZog
2018-04-25Workaround to CustomField initialization. #custom_fields_values requires to ↵Alban Peignier
know the associated referential. Refs #6669
2018-04-25Specify workgroup to Chouette::StopArea.custom_fields. Refs #6669Alban Peignier
2018-04-25Refs #6472; Add Constraint Zone exclusions to journeys6472-itls-exclusionsZog
along with the React interface
2018-04-22Fix netex import launch because referential is created after the netex ↵Luc Donnet
import and java call Refs #6645 @1
2018-04-21Merge pull request #508 from af83/6630-clean-up-fix-attemptLuc Donnet
Refs #6630 Fix server error on clean up
2018-04-20Merge pull request #473 from af83/6457-vj-company-affectationteddywing
Refs #6457 Fix VJ Company affectation
2018-04-20Merge pull request #468 from af83/6493-fix-stop_areas-sortteddywing
6493 Sort StopAreas on the type label, instead of the internal key
2018-04-20Refs #6630; Fix CleanUps Controller6630-clean-up-fix-attemptZog
Fix cleanups in the process
2018-04-20Refs #6630 Fix server error on clean upcedricnjanga
2018-04-19Refs #6193; Show journey length in VJs editorZog
If `journey_length_in_vehicle_journeys` feature is enabled
2018-04-19Refs #6574 Create decorators to handle sync actions for stop area ↵6574-sync-actions-in-decoratorscedricnjanga
referential and line referential
2018-04-19Merge pull request #500 from af83/6545-add_generic_navbarLuc Donnet
6545 add generic navbar
2018-04-19Add layout for devise views, Fix i18n on menu, Delete unused elements Refs ↵Luc Donnet
#6545 @1
2018-04-18Merge pull request #489 from af83/6476-merge-permissionsLuc Donnet
Refs #6476 Add merge permissions
2018-04-17Merge pull request #491 from af83/6549-fix-tiletables-specsAlban Peignier
Fix timetables specs. Fixes #6549
2018-04-17Don't set metadata on invalid modelsZog
2018-04-17Refs #6549; Fix timetables specs6549-fix-tiletables-specsZog
2018-04-16Refs #6476 Add merge permissions6476-merge-permissionscedricnjanga
2018-04-16Refs #6551; Add CustomFields to JourneyPatterns6551-add_custom_field_values_to_journey_patternsZog
2018-04-13Merge pull request #446 from af83/6382-compliance-control-block-refactoLuc Donnet
Refs #6382 Refacto display of ccblock transport mode errors
2018-04-13Refs #6536; Cleanup value passed for secondary_company_ids by the lines form6536-fix-lines-formZog