Merge branch 'dev' for release 2.5.1

.fabmanager-version

@@ -1 +1 @@
-2.5.0
+2.5.1

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog Fab Manager
 
+## v2.5.1 2017 March 28
+- hide spaces in admin's credit management if spaces are disabled
+- Fix a bug : Can not display training tracking (this bug was introduced in version 2.5.0)
+- [TODO DEPLOY] `rake assets:precompile`
+
 ## v2.5.0 2017 March 28
 
 - Ability to remove an unused custom price for an event (#61)

app/assets/templates/admin/pricing/credits.html.erb

@@ -96,11 +96,11 @@
   </tbody>
 </table>
 
-<h2 class="m-t-lg" translate>{{ 'pricing.spaces' }}</h2>
-<div class="btn-group m-t-md m-b-md">
+<h2 ng-hide="fablabWithoutSpaces" class="m-t-lg" translate>{{ 'pricing.spaces' }}</h2>
+<div ng-hide="fablabWithoutSpaces" class="btn-group m-t-md m-b-md">
   <button type="button" class="btn btn-warning" ng-click="addSpaceCredit($event)" translate>{{ 'pricing.add_a_space_credit' }}</button>
 </div>
-<table class="table">
+<table ng-hide="fablabWithoutSpaces" class="table">
   <thead>
   <tr>
     <th style="width:20%" translate>{{ 'pricing.space' }}</th>

app/controllers/api/trainings_controller.rb

@@ -57,7 +57,7 @@ def destroy
   def availabilities
     authorize Training
     @training = Training.find(params[:id])
-    @availabilities = @training.availabilities.includes(slots: {reservation: {user: [:profile, :trainings] }}).order('start_at DESC')
+    @availabilities = @training.availabilities.includes(slots: {reservations: {user: [:profile, :trainings] }}).order('start_at DESC')
   end
 
   private

app/views/api/trainings/availabilities.json.jbuilder

@@ -4,8 +4,8 @@ json.availabilities @availabilities do |a|
   json.start_at a.start_at.iso8601
   json.end_at a.end_at.iso8601
   json.reservation_users a.slots.map do |slot|
-    json.id slot.reservation.user_id
-    json.full_name slot.reservation.user.profile.full_name
-    json.is_valid slot.reservation.user.trainings.include?(@training)
+    json.id slot.reservations.first.user_id
+    json.full_name slot.reservations.first.user.profile.full_name
+    json.is_valid slot.reservations.first.user.trainings.include?(@training)
   end
 end