Merge pull request silverstripe#912 from chillu/pulls/7980

BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load (#7...
silverstripe-droptables · Oct 31, 2012 · 7d095a1 · 7d095a1
2 parents f861ff9 + bcbf463
commit 7d095a1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
@@ -1091,7 +1091,9 @@ public function getEditForm($id = null, $fields = null) {
 			$form->setAttribute('data-pjax-fragment', 'CurrentForm');
 
 			// Set this if you want to split up tabs into a separate header row
-			// if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+			// if($form->Fields()->hasTabset()) {
+			// 	$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+			// }
 
 			// Add a default or custom validator.
 			// @todo Currently the default Validator.js implementation

diff --git a/admin/code/SecurityAdmin.php b/admin/code/SecurityAdmin.php
@@ -127,7 +127,8 @@ public function getEditForm($id = null, $fields = null) {
 			// necessary for tree node selection in LeftAndMain.EditForm.js
 			new HiddenField('ID', false, 0)
 		);
-
+
+		// Tab nav in CMS is rendered through separate template		
 		$root->setTemplate('CMSTabSet');
 
 		// Add roles editing interface
@@ -161,7 +162,10 @@ public function getEditForm($id = null, $fields = null) {
 		);
 		$form->addExtraClass('cms-edit-form');
 		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
-		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+		// Tab nav in CMS is rendered through separate template
+		if($form->Fields()->hasTabset()) {
+			$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+		}
 		$form->addExtraClass('center ss-tabset cms-tabset ' . $this->BaseCSSClasses());
 		$form->setAttribute('data-pjax-fragment', 'CurrentForm');
 

diff --git a/admin/templates/CMSTabSet.ss b/admin/templates/CMSTabSet.ss
@@ -1,6 +1,10 @@
-<div $AttributesHTML>
-	<%-- Tab nav is rendered in CMSEditForm.ss --%>
+<%-- Exclude ".ss-tabset" class to avoid inheriting behaviour --%>
+<%-- The ".cms-tabset" class needs to be manually applied to a container elment, --%>
+<%-- above the level where the tab navigation is placed. --%>
+<%-- Tab navigation is rendered through various templates, --%>
+<%-- e.g. through LeftAndMain_EditForm.ss. --%>
 
+<div $AttributesHTML>
 	<% loop Tabs %>
 	<div $AttributesHTML>
 	<% if Tabs %>

diff --git a/forms/TabSet.php b/forms/TabSet.php
@@ -108,7 +108,7 @@ public function getAttributes() {
 			$this->attributes,
 			array(
 				'id' => $this->id(),
-				'class' => 'ss-tabset ' . $this->extraClass()
+				'class' => $this->extraClass()
 			)
 		);
 	}

diff --git a/forms/gridfield/GridFieldDetailForm.php b/forms/gridfield/GridFieldDetailForm.php
@@ -340,7 +340,7 @@ public function ItemEditForm() {
 			$form->setAttribute('data-pjax-fragment', 'CurrentForm Content');
 			if($form->Fields()->hasTabset()) {
 				$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
-				$form->addExtraClass('ss-tabset cms-tabset');
+				$form->addExtraClass('cms-tabset');
 			}
 
 			$form->Backlink = $this->getBackLink();

diff --git a/templates/forms/TabSet.ss b/templates/forms/TabSet.ss
@@ -1,4 +1,4 @@
-<div $AttributesHTML>
+<div $getAttributesHTML("class") class="ss-tabset $extraClass">
 	<ul>
 	<% loop Tabs %>
 		<li class="$FirstLast $MiddleString $extraClass"><a href="#$id" id="tab-$id">$Title</a></li>

diff --git a/tests/forms/FormFieldTest.php b/tests/forms/FormFieldTest.php
@@ -64,7 +64,7 @@ public function testAttributesHTML() {
 		$this->assertNotContains('two="2"', $field->getAttributesHTML('one', 'two'));
 		$this->assertContains('three="3"', $field->getAttributesHTML('one', 'two'));
 	}
-	
+
 	public function testEveryFieldTransformsReadonlyAsClone() {
 		$fieldClasses = ClassInfo::subclassesFor('FormField');
 		foreach($fieldClasses as $fieldClass) {