Merge pull request #928 from judgej/issue_775

Issue 775

src/Frozennode/Administrator/DataTable/Columns/Column.php

@@ -4,6 +4,7 @@
 use Frozennode\Administrator\Validator;
 use Frozennode\Administrator\Config\ConfigInterface;
 use Illuminate\Database\DatabaseManager as DB;
+use Illuminate\Database\Eloquent\Model;
 
 class Column {
 
@@ -240,16 +241,17 @@ public function getOption($key)
 	/**
 	 * Takes a column output string and renders the column with it (replacing '(:value)' with the column's field value)
 	 *
-	 * @param string	$value
+	 * @param $value string	$value
+	 * @param \Illuminate\Database\Eloquent\Model	$item
 	 *
 	 * @return string
 	 */
-	public function renderOutput($value)
+	public function renderOutput($value, $item = null)
 	{
 		$output = $this->getOption('output');
 
 		if (is_callable($output)) {
-			return $output($value);
+			return $output($value, $item);
 		}
 
 		return str_replace('(:value)', $value, $output);

src/Frozennode/Administrator/DataTable/DataTable.php

@@ -290,7 +290,7 @@ public function parseOnTableColumns($item, array &$outputRow)
 			{
 				$outputRow[$field] = array(
 					'raw' => $attributeValue,
-					'rendered' => $columns[$field]->renderOutput($attributeValue),
+					'rendered' => $columns[$field]->renderOutput($attributeValue, $item),
 				);
 			}
 			//otherwise it's likely the primary key column which wasn't included (though it's needed for identification purposes)
@@ -322,7 +322,7 @@ public function parseComputedColumns($item, array &$outputRow)
 		{
 			$outputRow[$name] = array(
 				'raw' => $item->{$name},
-				'rendered' => $columns[$name]->renderOutput($item->{$name}),
+				'rendered' => $columns[$name]->renderOutput($item->{$name}, $item),
 			);
 		}
 	}