From f58e6c91bc30fefe8b7a128c6a03d6631122f2d6 Mon Sep 17 00:00:00 2001
From: colymba <thierry@colymba.com>
Date: Wed, 31 Jul 2013 20:57:10 +0300
Subject: [PATCH] FIX #48 move URL generation before output

handling potential onAfterWrite changes on the record
---
 code/GridFieldBulkImageUpload_Request.php | 27 ++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/code/GridFieldBulkImageUpload_Request.php b/code/GridFieldBulkImageUpload_Request.php
index 0035c8c..322ef0f 100644
--- a/code/GridFieldBulkImageUpload_Request.php
+++ b/code/GridFieldBulkImageUpload_Request.php
@@ -357,13 +357,12 @@ class GridFieldBulkImageUpload_Request extends RequestHandler {
 		$uploadField->setRecord($record);
 		$uploadResponse = $uploadField->upload( $request );
 
-		//get uploaded File
+		//get uploaded File response datas
 		$uploadResponse = Convert::json2array( $uploadResponse->getBody() );
 		$uploadResponse = array_shift( $uploadResponse );
-		$uploadedFile = DataObject::get_by_id( $this->getFileRelationClassName(), $uploadResponse['id'] );
-
+		
 		// Attach the file to record.				
-		$record->{"{$fileRelationName}ID"} = $uploadedFile->ID;					
+		$record->{"{$fileRelationName}ID"} = $uploadResponse['id'];					
 		$record->write();
 
 		// attached record to gridField relation
@@ -372,9 +371,27 @@ class GridFieldBulkImageUpload_Request extends RequestHandler {
 		//get record's CMS Fields
 		$recordEditableFormFields = $this->getRecordHTMLFormFields( $record->ID );
 		
+		//fetch uploadedFile record and sort out previewURL
+		//update $uploadResponse datas in case changes happened onAfterWrite()
+		$uploadedFile = DataObject::get_by_id( $this->getFileRelationClassName(), $uploadResponse['id'] );
+		if ( $uploadedFile )
+		{
+			$uploadResponse['name'] = $uploadedFile->Name;
+			$uploadResponse['url'] = $uploadedFile->getURL();
+
+			if ( $uploadedFile instanceof Image )
+			{
+				$uploadResponse['preview_url'] = $uploadedFile->setHeight(55)->Link();
+				$uploadResponse['thumbnail_url'] = $uploadedFile->StripThumbnail()->getURL();
+			}
+			else{
+				$uploadResponse['preview_url'] = $uploadedFile->Icon();
+				$uploadResponse['thumbnail_url'] = $uploadedFile->Icon();
+			}
+		}
+
 		// Collect all output data.
 		$return = array_merge($uploadResponse, array(
-			'preview_url' => $uploadedFile->setHeight(55)->Link(),
 			'record' => array(
 				'ID' => $record->ID,
 				'fields' => $recordEditableFormFields