From e858222ce11432b3647ab93cc623fc1597664776 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 6 Aug 2008 03:36:18 +0000 Subject: [PATCH] (merged from branches/roa. use "svn log -c -g " for detailed commit message) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59925 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/ModelAdmin.php | 1 - templates/Includes/ModelAdmin_left.ss | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index b6cc53ec..bef5e628 100644 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -127,7 +127,6 @@ abstract class ModelAdmin extends LeftAndMain { new FormAction('add', _t('GenericDataAdmin.CREATE')) ) ); - return $form; } diff --git a/templates/Includes/ModelAdmin_left.ss b/templates/Includes/ModelAdmin_left.ss index 85d04d70..8b0f4950 100755 --- a/templates/Includes/ModelAdmin_left.ss +++ b/templates/Includes/ModelAdmin_left.ss @@ -4,14 +4,16 @@ $AddForm

<% _t('SEARCHLISTINGS','Search Listings') %>

-
-
    +
    +
      <% control SearchForms %> -
    • $Title
    • +
    • $Title
    • <% end_control %>
    <% control SearchForms %> +
    $Form +
    <% end_control %>

    <% _t('SEARCHRESULTS','Search Results') %>