From ccd2581f1a4fb88d2324df190fa58a5c07e2afa0 Mon Sep 17 00:00:00 2001
From: Zog
Date: Fri, 6 Apr 2018 06:59:57 +0200
Subject: Refs #6311; Fix Purchase Windows assignment

---
 app/javascript/vehicle_journeys/actions/index.js   |  9 ++-------
 app/views/autocomplete_purchase_windows/index.rabl | 13 +++++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/javascript/vehicle_journeys/actions/index.js b/app/javascript/vehicle_journeys/actions/index.js
index e00e9b1b0..537dcfc06 100644
--- a/app/javascript/vehicle_journeys/actions/index.js
+++ b/app/javascript/vehicle_journeys/actions/index.js
@@ -113,14 +113,9 @@ const actions = {
     type : 'EDIT_PURCHASE_WINDOWS_VEHICLEJOURNEY_MODAL',
     vehicleJourneys
   }),
-  selectPurchaseWindowsModal: (selectedWindow) =>({
+  selectPurchaseWindowsModal: (selectedItem) =>({
     type: 'SELECT_PURCHASE_WINDOW_MODAL',
-    selectedItem:{
-      id: selectedWindow.id,
-      name: selectedWindow.name,
-      color: selectedWindow.color,
-      objectid: selectedWindow.objectid
-    }
+    selectedItem
   }),
   addSelectedPurchaseWindow: () => ({
     type: 'ADD_SELECTED_PURCHASE_WINDOW'
diff --git a/app/views/autocomplete_purchase_windows/index.rabl b/app/views/autocomplete_purchase_windows/index.rabl
index 1d0287602..bdc513c31 100644
--- a/app/views/autocomplete_purchase_windows/index.rabl
+++ b/app/views/autocomplete_purchase_windows/index.rabl
@@ -2,11 +2,12 @@ collection @purchase_windows, :object_root => false
 
 node do |window|
   {
-    :id => window.id,
-    :name => window.name,
-    :objectid => window.objectid,
-    :color => window.color,
-    :short_id => window.get_objectid.short_id,
-    :text => "<strong><span class='fa fa-circle' style='color:" + (window.color ? window.color : '#4b4b4b') + "'></span> " + window.name + " - " + window.get_objectid.short_id + "</strong>"
+    id: window.id,
+    name: window.name,
+    objectid: window.objectid,
+    color: window.color,
+    short_id: window.get_objectid.short_id,
+    bounding_dates: window.bounding_dates,
+    text: "<strong><span class='fa fa-circle' style='color:" + (window.color ? window.color : '#4b4b4b') + "'></span> " + window.name + " - " + window.get_objectid.short_id + "</strong>"
   }
 end
-- 
cgit v1.2.3