From 79d52a2382ff0cca2068a84b574a4e99d68167c3 Mon Sep 17 00:00:00 2001
From: Normann Lou <normannlou@gmail.com>
Date: Mon, 5 Mar 2012 12:45:05 +1300
Subject: [PATCH] ENHANCEMENT SSF-53: put a unlink button in the "Actions"
 column rather than holding a separate column for easy styling

---
 forms/gridfield/GridFieldRelationDelete.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/forms/gridfield/GridFieldRelationDelete.php b/forms/gridfield/GridFieldRelationDelete.php
index 7de46085ee4..b2cd41ba8bd 100644
--- a/forms/gridfield/GridFieldRelationDelete.php
+++ b/forms/gridfield/GridFieldRelationDelete.php
@@ -14,7 +14,8 @@ class GridFieldRelationDelete implements GridField_ColumnProvider, GridField_Act
 	 * @param array $columns 
 	 */
 	public function augmentColumns($gridField, &$columns) {
-		$columns[] = 'UnlinkRelation';
+		if(!in_array('Actions', $columns))
+			$columns[] = 'Actions';
 	}
 	
 	/**
@@ -37,7 +38,7 @@ public function getColumnAttributes($gridField, $record, $columnName) {
 	 * @return array
 	 */
 	public function getColumnMetadata($gridField, $columnName) {
-		if($columnName == 'UnlinkRelation') {
+		if($columnName == 'Actions') {
 			return array('title' => '');
 		}
 	}
@@ -49,7 +50,7 @@ public function getColumnMetadata($gridField, $columnName) {
 	 * @return type 
 	 */
 	public function getColumnsHandled($gridField) {
-		return array('UnlinkRelation');
+		return array('Actions');
 	}
 	
 	/**