Merge branch 'dev' into us78

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Fix a bug: error handling on password recovery
 - Fix a bug: error handling on machine attachment upload
+- Fix a bug: first day of week is ignored in statistics custom filter
 - Refactored frontend invoices translations
 
 ## v2.8.1 2019 January 02

app/assets/javascripts/controllers/admin/statistics.js.erb

@@ -94,9 +94,9 @@ Application.Controllers.controller('StatisticsController', ['$scope', '$state',
         minDate: null,
         maxDate: moment().toDate(),
         options: {
-          startingDay: 1
+          startingDay: Fablab.weekStartingDay
         }
-      } // France: the week starts on monday
+      }
     };
 
     // available custom filters

app/controllers/api/abuses_controller.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+# API Controller for resources of type Abuse.
+# Typical action is an user reporting an abuse on a project
 class API::AbusesController < API::ApiController
   before_action :authenticate_user!, except: :create
 

app/controllers/api/admins_controller.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# API Controller for resources of type User with role 'admin'.
 class API::AdminsController < API::ApiController
   before_action :authenticate_user!
 

app/controllers/api/age_ranges_controller.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
+# API Controller for resources of type AgeRange
+# AgeRange are used in Events
 class API::AgeRangesController < API::ApiController
   before_action :authenticate_user!, except: [:index]
-  before_action :set_age_range, only: [:show, :update, :destroy]
+  before_action :set_age_range, only: %i[show update destroy]
 
   def index
     @age_ranges = AgeRange.all
   end
 
-  def show
+  def show; end
-  end
 
   def create
     authorize AgeRange