| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
While the 'x' button in the Select2 was available in the 'edit' modal
for a vehicle journey, it was not in the 'add' modal. Thus, once you
added an associated company, you couldn't remove it in the modal. You'd
either have to cancel and create your vehicle journey again, or create
it an delete the company in the 'edit' modal later.
This enables the 'x' button in the 'add' modal (it previously was only
enabled when `editMode` was active) and sets the proper action/reducer
to remove the company.
The `allowClear` attribute was changed to only work in the 'edit' modal
in 0079238842263768b88b0fa0fd977824b49eabd5. That commit appears to be
changing things so that certain functions work when not in 'edit' mode.
The case we're concerned about is that the 'edit' modal can be opened
when in 'view' mode (not 'edit' mode) in order to get more detailed
information about a vehicle journey. This means the company Select2 is
available in 'view' mode, and the 'x' button should not be visible in
that case. But, when I tested this, even with `allowClear: true`, the
'x' button wasn't visible. This, I can only assume, is because the
Select2 is in a 'disabled' state, so it's smart enough to know not to
show the 'x' button. Which works great for us, because this allows us to
not show the 'x' button here and still show it in the 'add' and 'edit'
modals.
Refs #5574
|
|
|
|
|
|
|
|
|
|
Add line breaks to make this method more readable.
Refs #5574
|
|
If the state doesn't contain a company, that means it was deleted on the
frontend. In that case, the backend code should correctly delete the
associated company from the vehicle journey.
Refs #5574
|
|
Ensure a time is set for all non-commercial stops
|
|
- Add a `kind` attribute
- Hide irrelevant fields in the form
|
|
This determines if the StopArea is commercial or not
The useless fields are hidden in the form for the non-commercials ones
|
|
|
|
When 1 or 2 stops have been selected
|
|
on ReferentialVehicleJourneys#index
|
|
The other migration for this in
`db/migrate/20180126134944_add_kind_to_stop_areas.rb` didn't handle
`kind IS NULL`. Since all the `kind`s were initialised to NULL when the
column was created, the `where` query didn't select any stop areas
because it was looking for those with some varchar value, and thus it
wasn't able to update any.
This ensures our existing records all have a `kind` in case we end up
using the field in a template at some point and our old data bugs out.
Refs #5817
|
|
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`.
|
|
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
|
|
|
|
5417 Update parents checksum when children are created or updated
|
|
|
|
5835 Timetables inherit application days from calendars
|
|
5832 fix filter by stopareas on vjs index
|
|
5825 Fix info window behaviour on VJs editor
|
|
After re-reading the ticket, I see now that the aborting of old imports
should only apply to `NetexImport`s. Update the code to make this
happen.
Refs #4963
|
|
As a result of a new requirement, before doing the existing work we were
doing in the imports cron job (notifying parent imports), we first need
to clear out old imports and mark them as 'aborted'.
Refs #4963
|
|
Imports that have a `finished_status` should not be changed to
`aborted`.
Refs #4963
|
|
This will abort all imports that don't have a finished status and were
created more than four hours ago.
We want to add this functionality to the import cron to auto-abort stale
imports.
Refs #4963
|
|
5844 Add missing translation
|
|
|
|
|
|
5830 Fix RouteDecorator's duplicate action
|
|
3542 referential overview
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
