Merge branch 'dev' for release 2.5.12

.fabmanager-version

@@ -1 +1 @@
-2.5.11
+2.5.12

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog Fab Manager
 
+## v2.5.12 2017 September 11
+
+- Fix a bug: Long words overflow from homepage's events blocks
+- Fix a bug: ActiveRecord::RecordNotFound when running rake task fix:recursive_events_over_DST
+
 ## v2.5.11 2017 September 7
 
 - Added tooltip concerning images insertion while configuring the about page

app/assets/stylesheets/app.layout.scss

@@ -619,3 +619,9 @@ body.container{
 .calendar-filter-aside {
   padding: 20px;
 }
+
+.home-events {
+  .event-description {
+    overflow: hidden;
+  }
+}

app/assets/templates/home.html.erb

@@ -79,7 +79,7 @@
 
 	</div>
 
-  <section class="col-lg-12 wrapper">
+  <section class="home-events col-lg-12 wrapper">
       <h4 class="text-sm m-t-sm">{{ 'fablab_s_next_events' | translate }} <a ui-sref="app.public.events_list" class="pull-right"><i class="fa fa-tags"></i> {{ 'every_events' | translate }}</a></h4>
 
       <div class="row" ng-repeat="event in (upcomingEvents.length/3 | array)">
@@ -100,7 +100,7 @@
                     <span class="v-middle badge text-xs" ng-class="'bg-{{event.category.name | lowercase}}'">{{event.category.name}}</span>
                   </div>
               </div>
-              <p ng-bind-html="event.description | simpleText | humanize : 500 | breakFilter"></p>
+              <p class="event-description" ng-bind-html="event.description | simpleText | humanize : 500 | breakFilter"></p>
 
               <hr/>
               <div class="row">

docker/README.md

@@ -75,7 +75,7 @@ mkdir -p /apps/fabmanager/config
 ```
 
 Make a copy of the **docker/env.example** file and use it as a starting point.
-Set all the environment variables needed by your application. Please refer to the [FabManager README](https://github.com/LaCasemate/fab-manager/blob/master/README.md) for explanations about those variables.
+Set all the environment variables needed by your application. Please refer to the [FabManager README](https://github.com/LaCasemate/fab-manager/blob/master/README.md#environment-configuration) for explanations about those variables.
 
 
 Then, copy the previously customized `env.example` file as `/apps/fabmanager/config/env`

lib/tasks/fablab/fix.rake

@@ -62,13 +62,19 @@ namespace :fablab do
       include ApplicationHelper
       groups = Event.group(:recurrence_id).count
       groups.keys.each do |recurrent_event_id|
-        initial_event = Event.find(recurrent_event_id)
-        Event.where(recurrence_id: recurrent_event_id).where.not(id: recurrent_event_id).each do |event|
-          availability = event.availability
-          if initial_event.availability.start_at.hour != availability.start_at.hour
-            availability.start_at = dst_correction(initial_event.availability.start_at, availability.start_at)
-            availability.end_at = dst_correction(initial_event.availability.end_at, availability.end_at)
-            availability.save!
+        if recurrent_event_id
+          initial_event = Event.find(recurrent_event_id)
+          if initial_event
+            Event.where(recurrence_id: recurrent_event_id).where.not(id: recurrent_event_id).each do |event|
+              availability = event.availability
+              if initial_event.availability.start_at.hour != availability.start_at.hour
+                availability.start_at = dst_correction(initial_event.availability.start_at, availability.start_at)
+                availability.end_at = dst_correction(initial_event.availability.end_at, availability.end_at)
+                availability.save!
+              end
+            end
+          else
+            puts "Error: The initial event (id: #{recurrent_event_id}) of the recurrence was not found. You may have to correct events manually"
           end
         end
       end