Fix issue with tab state restoration when returning from GridField (#24)

isobar-nz · Jul 27, 2018 · 88c2ec5 · 88c2ec5
1 parent 6f8c3be
commit 88c2ec5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 28 deletions.
diff --git a/src/LittleGiant/SinglePageAdmin/SinglePageAdmin.php b/src/LittleGiant/SinglePageAdmin/SinglePageAdmin.php
@@ -583,4 +583,11 @@ public function edit($request)
         }
     }
 
+    /**
+     * @return string
+     */
+    public function Backlink()
+    {
+        return $this->Link();
+    }
 }
diff --git a/templates/LittleGiant/SinglePageAdmin/Includes/SinglePageAdmin_Content.ss b/templates/LittleGiant/SinglePageAdmin/Includes/SinglePageAdmin_Content.ss
@@ -7,18 +7,6 @@
                 <% if $BreadcrumbsBackLink %><a href="$BreadcrumbsBackLink" class="btn btn-secondary btn--no-text font-icon-left-open-big hidden-lg-up toolbar__back-button"></a><% end_if %>
                 <% include SilverStripe\\Admin\\CMSBreadcrumbs %>
             </div>
-
-            <% if $EditForm.Fields.hasTabset %>
-                <% with $EditForm.Fields.fieldByName('Root') %>
-                    <div class="cms-content-header-tabs cms-tabset">
-                        <ul class="cms-tabset-nav-primary nav nav-tabs">
-                            <% loop $Tabs %>
-                                <li class="nav-item<% if $extraClass %> $extraClass<% end_if %>"><a href="#$id">$Title</a></li>
-                            <% end_loop %>
-                        </ul>
-                    </div>
-                <% end_with %>
-            <% end_if %>
         </div>
 
         <div class="flexbox-area-grow fill-height">

diff --git a/templates/LittleGiant/SinglePageAdmin/Includes/SinglePageAdmin_EditForm.ss b/templates/LittleGiant/SinglePageAdmin/Includes/SinglePageAdmin_EditForm.ss
@@ -10,21 +10,7 @@
         <fieldset>
             <% if $Legend %><legend>$Legend</legend><% end_if %>
             <% loop $Fields %>
-                <% if $Tabs %>
-                    <% loop $Tabs %>
-                        <% if $Tabs %>
-                            $FieldHolder
-                        <% else %>
-                            <div $AttributesHTML>
-                                <% loop $Fields %>
-                                    $FieldHolder
-                                <% end_loop %>
-                            </div>
-                        <% end_if %>
-                    <% end_loop %>
-                <% else %>
-                    $FieldHolder
-                <% end_if %>
+                $FieldHolder
             <% end_loop %>
             <div class="clear"><!-- --></div>
         </fieldset>
@@ -34,7 +20,7 @@
         <% if $Actions %>
             <div class="btn-toolbar">
                 <% loop $Actions %>
-                    $Field
+                    $FieldHolder
                 <% end_loop %>
                 <% if $Controller.LinkPreview %>
                     <a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">