aboutsummaryrefslogtreecommitdiffstats
path: root/app
AgeCommit message (Collapse)Author
2018-02-09Refs #4126 @2h; Add more translationsZog
2018-02-09Refs #4126 @6h; Add i18n to JSZog
2018-02-09Add table name in unaccent request (to avoid problem with ↵Alban Peignier
Referential#stop_areas has_many through. Refs #5824
2018-02-09Remove Referential#stop_areas to use stop_areas has_many through. Refs #5824Alban Peignier
2018-02-09Merge pull request #252 from af83/5669-specs-snpashotsLuc Donnet
Ajout de snapshots dans les specs
2018-02-09Fix display compliance_check_sets#index for referential destroyed Refs #5874 @1Luc Donnet
2018-02-09Refs #5669; Add a preview for snapshots for easier debuggingZog
2018-02-08checksum_support.rb: Add whitespaceTeddy Wing
Make `#checksum_replace_nil_or_empty_values` more readable. Refs #5416
2018-02-08checksum_support.rb: Simplify checksum value mapTeddy Wing
Add Johan's suggestion for simplifying this line. This allows us to get rid of one of the `#map` calls. Refs #5416
2018-02-08imports.rake(notify_parent): Use `ParentNotifier`Teddy Wing
Replace `ParentImportNotifier` with the new generalised `ParentNotifier`. This will allow us to use the same service for parent notification of both imports and compliance check sets. Delete the `ParentImportNotifier` class and spec as these are now superseded by `ParentNotifier`. Refs #4758
2018-02-08Add `ParentNotifier` serviceTeddy Wing
This is a takeoff on `ParentImportNotifier`. I just copied over the class and spec and generalised the service to work with `Import`-style interfaces. We can now use the same notifier service class for both imports and compliance check sets. Refs #4758
2018-02-08ComplianceCheckSet: Add `.abort_old`Teddy Wing
Copy over the `Import.abort_old` method to this class. For now I haven't bothered with moving it to a consolidated module. We'll see, maybe that's a better approach. For now I'm going with a relaxed copy-paste solution until we decide that the increased complexity of the module is worth the deduplication. We need this method to be able to abort stale imports. We'll be doing this, similarly to imports, in a regular cron job. Refs #4758
2018-02-07Refs #5815 Add required fields to some compliance controlscedricnjanga
2018-02-07Refs #5709 Fix CCSet index table builder sorting & add show button in gear ↵5709_fix_ccset_sortingcedricnjanga
menu link
2018-02-07Edit checksum stop_points attributes for routeXinhui
Refs #5416
2018-02-07Edit support of list attributesXinhui
Refs #5416
2018-02-07Remove workgroup support5683-add_workgroup_id_to_calendarscedricnjanga
2018-02-07Merge branch 'master' into 5683-add_workgroup_id_to_calendarscedricnjanga
2018-02-07Update branch according to mastercedricnjanga
2018-02-07Refs #5750 @1h; Add a "kind" attribute to StopAreasZog
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
2018-02-07Refs #5682 @3h; Use same UI as for timetablesZog
2018-02-07Refs #5682; Add application_days field to calendarsZog
2018-02-07Refs #5750 @1h; Add a "kind" attribute to StopAreasZog
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
2018-02-07Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-07update calendar build_links for table buildercedricnjanga
2018-02-07Refs #5683 @2H; Fix specs and refactor action_linksZog
Note: Did not fix the missing workgroup in the calendar mailer
2018-02-07Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-07update calendar build_links for table buildercedricnjanga
2018-02-07First draft for including calendars into workgroup for having appropriate ↵cedricnjanga
scoping
2018-02-07Begin workbench output show refactoring to use stif guidelinesLuc Donnet
2018-02-07Revert "Prevent problem with StopArea#kind. Refs #5817"Teddy Wing
This reverts commit c2bc391ee91cac70e726d188be97dd2323df0df2. Thanks to 76abdbd66c16e6e1233685a5fa28a42cba5580d9, this temporary fix can be reverted. We don't actually need `kind` selected here, it was only added to appease the auto-initialisation of `kind` in `StopArea`. Now that we don't set a default value for `kind` on initialisation, we can remove it from this `select`.
2018-02-07StopArea: Don't auto-initialise a value for the `kind` attributeTeddy Wing
We were getting this error on `ReferentialVehicleJourneys#index`: Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Started GET "/referentials/9/vehicle_journeys" for 172.28.10.14 at 2018-02-01 17:48:32 +0100 Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Processing by ReferentialVehicleJourneysController#index as HTML Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Parameters: {"referential_id"=>"9"} Feb 1 17:48:32 chouette-dev rails/chouette[18900]: locale set to :fr Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Rendered referential_vehicle_journeys/_filters.html.slim (37.0ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Rendered referential_vehicle_journeys/index.html.slim within layouts/application (54.3ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Completed 500 Internal Server Error in 73ms (ActiveRecord: 10.4ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: ActionView::Template::Error (missing attribute: kind):#012 23: = f.input :published_journey_name_lteq, label: false, wrapper_html: { class: 'w45'}#012 24: .form-group.togglable#012 25: = f.label Chouette::StopArea.model_name.human.pluralize, required: false, class: 'control-label'#012 26: = f.input :stop_area_ids, collection: @all_stop_areas.select(:id, :name).order(name: :asc), checked: params[:q] && params[:q][:stop_area_ids], as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + l.name + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}, multiple: true#012 27: .form-group.togglable#012 28: = f.label Chouette::VehicleJourney.human_attribute_name(:purchase_window), class: 'control-label'#012 29: .filter_menu#012 app/models/chouette/stop_area.rb:51:in `block in <class:StopArea>'#012 app/views/referential_vehicle_journeys/_filters.html.slim:26:in `block in _app_views_referential_vehicle_journeys__filters_html_slim__692539656386688985_47285414929500'#012 app/views/referential_vehicle_journeys/_filters.html.slim:1:in `_app_views_referential_vehicle_journeys__filters_html_slim__692539656386688985_47285414929500'#012 app/views/referential_vehicle_journeys/index.html.slim:9:in `_app_views_referential_vehicle_journeys_index_html_slim___336434325333090796_47285419865660' Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Processing by ErrorsController#server_error as HTML Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Parameters: {"referential_id"=>"9"} Feb 1 17:48:32 chouette-dev rails/chouette[18900]: locale set to :fr or, this one locally which is easier to read: ActiveModel::MissingAttributeError in ReferentialVehicleJourneys#index Showing .../stif-boiv/app/views/referential_vehicle_journeys/_filters.html.slim where line #44 raised: missing attribute: kind Extracted source (around line #51): after_initialize do > self.kind ||= :commercial end def self.nullable_attributes Trace of template inclusion: app/views/referential_vehicle_journeys/index.html.slim Rails.root: .../stif-boiv Application Trace | Framework Trace | Full Trace app/models/chouette/stop_area.rb:51:in `block in <class:StopArea>' app/views/referential_vehicle_journeys/_filters.html.slim:44:in `block in _app_views_referential_vehicle_journeys__filters_html_slim___131528464712770693_70134715599760' app/views/referential_vehicle_journeys/_filters.html.slim:1:in `_app_views_referential_vehicle_journeys__filters_html_slim___131528464712770693_70134715599760' app/views/referential_vehicle_journeys/index.html.slim:9:in `_app_views_referential_vehicle_journeys_index_html_slim__3124451149445015007_70134715309040' This is because on `ReferentialVehicleJourneys#index`, the StopArea filter makes this query: @all_stop_areas.select(:id, :name).order(name: :asc) Alban added a temporary fix for the release in c2bc391ee91cac70e726d188be97dd2323df0df2. After a discussion with Luc, he said we only want the initial value on the `#new` form, and we decided to take this out of the model and put it in the form template instead. Here, when a new `StopArea` is created, `:commercial` will be pre-filled in the `kind` field by default. On the `#edit` page, it should show the existing value of `kind` but not permit editing. Refs #5817
2018-02-07Define @year in CalendarsController as expected by view. Refs #5682Alban Peignier
2018-02-07Refs #5682 @3h; Use same UI as for timetablesZog
2018-02-07Refs #5565 Remove the application name on the error pagescedricnjanga
2018-02-07Begin workbench output show refactoring to use stif guidelinesLuc Donnet
2018-02-06Update calendar form_simple according to workgroupcedricnjanga
2018-02-06Remove workgroup_support concerncedricnjanga
2018-02-06Refs #5683 @2H; Fix specs and refactor action_linksZog
Note: Did not fix the missing workgroup in the calendar mailer
2018-02-06Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-06update calendar build_links for table buildercedricnjanga
2018-02-06First draft for including calendars into workgroup for having appropriate ↵cedricnjanga
scoping
2018-02-06Refs #5750 @1h; Add a "kind" attribute to StopAreasZog
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
2018-02-06Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-06update calendar build_links for table buildercedricnjanga
2018-02-06Refs #5683 @2H; Fix specs and refactor action_linksZog
Note: Did not fix the missing workgroup in the calendar mailer
2018-02-06Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-06update calendar build_links for table buildercedricnjanga
2018-02-06First draft for including calendars into workgroup for having appropriate ↵cedricnjanga
scoping
2018-02-06Refs #5565 Remove the application name on the error pagescedricnjanga