aboutsummaryrefslogtreecommitdiffstats
path: root/app
AgeCommit message (Collapse)Author
2018-02-14Merge branch 'master' into 3562_ccset_affectation3562_ccset_affectationcedricnjanga
2018-02-13Refs #3562 add workbench edit button on workbench#showcedricnjanga
2018-02-13Merge pull request #216 from af83/5416_checksum_attributeJohan Van Ryseghem
5416 checksum attribute
2018-02-13Merge pull request #301 from af83/5150-update-decoratorsteddywing
5150 Update decorators
2018-02-13Merge pull request #300 from af83/5888-fix-i18n-in-jsLuc Donnet
5888 Fix I18n in JS
2018-02-13Merge pull request #287 from af83/4963-import-cron-should-abort-old-importsJohan Van Ryseghem
4963 import cron should abort old imports
2018-02-13Refs #5707; Add specsZog
2018-02-13Refs #5707 update the global status method to avoid unacessary db requestscedricnjanga
2018-02-13Refs #5707 Add status to the application to track 'blocked objects'cedricnjanga
2018-02-13Merge pull request #291 from ↵Johan Van Ryseghem
af83/4758-cron-job-to-finalise-compliance_check_set-validations-- 4758 cron job to finalise compliance check set validations
2018-02-13Merge pull request #293 from af83/5815_add_required_fields_for_ccJohan Van Ryseghem
5815 add required fields for cc
2018-02-12Use @workgroup instead of current_workgroup in calendars#_filters. Refs #5683Alban Peignier
2018-02-12Refs #5432; Fix vj#show.rablZog
2018-02-12Add table name in unaccent request (to avoid problem with ↵Alban Peignier
Referential#stop_areas has_many through. Refs #5824
2018-02-12Remove Referential#stop_areas to use stop_areas has_many through. Refs #5824Alban Peignier
2018-02-12Fix display compliance_check_sets#index for referential destroyed Refs #5874 @1Luc Donnet
2018-02-12Refs #5669; Add a preview for snapshots for easier debuggingZog
2018-02-12Refs #5709 Fix CCSet index table builder sorting & add show button in gear ↵cedricnjanga
menu link
2018-02-12Remove workgroup supportcedricnjanga
2018-02-12Update branch according to mastercedricnjanga
2018-02-12Refs #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-12Refs #5682 @3h; Use same UI as for timetablesZog
2018-02-12Refs #5682; Add application_days field to calendarsZog
2018-02-12Refs #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-12Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-12update calendar build_links for table buildercedricnjanga
2018-02-12Refs #5683 @2H; Fix specs and refactor action_linksZog
Note: Did not fix the missing workgroup in the calendar mailer
2018-02-12Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-12update calendar build_links for table buildercedricnjanga
2018-02-12First draft for including calendars into workgroup for having appropriate ↵cedricnjanga
scoping
2018-02-12StopArea: 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-12Define @year in CalendarsController as expected by view. Refs #5682Alban Peignier
2018-02-12Refs #5682 @3h; Use same UI as for timetablesZog
2018-02-12Refs #4126 @2h; Add more translationsZog
2018-02-12Refs #4126 @6h; Add i18n to JSZog
2018-02-12Update calendar form_simple according to workgroupcedricnjanga
2018-02-12Remove workgroup_support concerncedricnjanga
2018-02-12Refs #5683 @2H; Fix specs and refactor action_linksZog
Note: Did not fix the missing workgroup in the calendar mailer
2018-02-12Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-12update calendar build_links for table buildercedricnjanga
2018-02-12First draft for including calendars into workgroup for having appropriate ↵cedricnjanga
scoping
2018-02-12Refs #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-12Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-12update calendar build_links for table buildercedricnjanga
2018-02-12Refs #5683 @2H; Fix specs and refactor action_linksZog
Note: Did not fix the missing workgroup in the calendar mailer
2018-02-12Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-02-12update calendar build_links for table buildercedricnjanga
2018-02-12First draft for including calendars into workgroup for having appropriate ↵cedricnjanga
scoping
2018-02-12Refs #3542; Add a date lookupZog
2018-02-12Refs #3542 @2h; Various UI improvements (hopefully)Zog