From 5cd507ecaa1e6d482d1062e69786fbe6987a5837 Mon Sep 17 00:00:00 2001 From: Hayden Smith Date: Tue, 12 Aug 2008 23:17:21 +0000 Subject: [PATCH] Merged [47101]: Adds class=action to action cells in MemberTableField. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60548 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/GenericDataAdmin.php | 8 +++++--- templates/Includes/MemberTableField.ss | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/GenericDataAdmin.php b/code/GenericDataAdmin.php index 68317e80..3dc61958 100755 --- a/code/GenericDataAdmin.php +++ b/code/GenericDataAdmin.php @@ -412,9 +412,11 @@ HTML; $result = $tmpItem; } - // casting - list ($field, $caster) = explode("->", $field); - if($caster) { + if(strpos('->', $field) !== false) { + list ($field, $caster) = explode("->", $field); + } + + if(!empty($caster)) { $fieldNameParts = explode('.', $field); $fieldName = $fieldNameParts[sizeof($fieldNameParts)-1]; // When the intending value is Created.Date, the obj need to be casted as Datetime explicitely. diff --git a/templates/Includes/MemberTableField.ss b/templates/Includes/MemberTableField.ss index a1dae44e..4264e064 100755 --- a/templates/Includes/MemberTableField.ss +++ b/templates/Includes/MemberTableField.ss @@ -41,17 +41,17 @@ $Value <% end_control %> <% if Can(show) %> - + show <% end_if %> <% if Can(edit) %> - + edit <% end_if %> <% if Can(delete) %> - + delete <% end_if %>