tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load (#7980)

Browse Source 
The existence of .ss-tabset triggers JS which applies $.tabs(),
and in turn interprets the first available link as the tab navigation.
jQuery UI subsequently tries to ajax-load this link, which is not
desired. Instead, $.tabs() should *only* be applied to a container
DOM element with .cms-tabset applied.
This commit is contained in:
Ingo Schommer 2012-10-31 15:57:48 +01:00
parent f861ff9dfa
commit bcbf4636fc
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/code/LeftAndMain.php
View File

@ -1091,7 +1091,9 @@ class LeftAndMain extends Controller implements PermissionProvider {
$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

6
admin/code/SecurityAdmin.php
View File

@ -128,6 +128,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
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 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
);
$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');

8
admin/templates/CMSTabSet.ss
View File

@ -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 %>

2
forms/TabSet.php
View File

@ -108,7 +108,7 @@ class TabSet extends CompositeField {
$this->attributes,
array(
'id' => $this->id(),
'class' => 'ss-tabset ' . $this->extraClass()
'class' => $this->extraClass()
)
);
}

2
forms/gridfield/GridFieldDetailForm.php
View File

@ -340,7 +340,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
$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();

2
templates/forms/TabSet.ss
View File

@ -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>