Skip to content

Commit

Permalink
API Update references to API which has been renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Oct 2, 2024
1 parent c13339a commit f9dfc78
Show file tree
Hide file tree
Showing 23 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion code/Forms/UsedOnTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public function setRecord($record)
public function getAttributes()
{
$attributes = [
'class' => $this->extraClass(),
'class' => $this->getExtraClass(),
'id' => $this->ID(),
'data-schema' => json_encode($this->getSchemaData()),
'data-state' => json_encode($this->getSchemaState()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<fieldset>
<% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %>
$FieldHolder
$renderFieldHolder
<% end_loop %>
<div class="clear"><!-- --></div>
</fieldset>
Expand All @@ -20,7 +20,7 @@
<% if $Actions %>
<div class="btn-toolbar">
<% loop $Actions %>
$Field
$renderField
<% end_loop %>
</div>
<% end_if %>
Expand Down
4 changes: 2 additions & 2 deletions templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<fieldset>
<% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %>
$FieldHolder
$renderFieldHolder
<% end_loop %>
<div class="clear"><!-- --></div>
</fieldset>
Expand All @@ -47,7 +47,7 @@
<% if $Actions %>
<div class="btn-toolbar">
<% loop $Actions %>
$FieldHolder
$renderFieldHolder
<% end_loop %>
<% if $Controller.LinkPreview %>
<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
Expand Down
2 changes: 1 addition & 1 deletion tests/php/ModelAdminTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public function testGetGridField()

$this->assertStringContainsString(
'OverridenModelAdmin',
$field->extraClass(),
$field->getExtraClass(),
'OverridenModelAdmin has added an extra class to the grid field'
);
$this->assertStringContainsString(
Expand Down
2 changes: 1 addition & 1 deletion themes/cms-forms/templates/RightLabelledFieldHolder.ss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p id="$Name" class="field $Type">
$Field
$renderField
<label class="right" for="$id">$Title</label>
<% if $Message %><span class="alert $AlertType">$Message</span><% end_if %>
</p>
4 changes: 2 additions & 2 deletions themes/cms-forms/templates/SilverStripe/Forms/CMSTabSet.ss
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<div class="tab-content">
<% loop $Tabs %>
<% if $Tabs %>
$FieldHolder
$renderFieldHolder
<% else %>
<div $getAttributesHTML("class") class="tab-pane $extraClass">
<% loop $Fields %>
$FieldHolder
$renderFieldHolder
<% end_loop %>
</div>
<% end_if %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="$HolderID" class="form-group field<% if $extraClass %> $extraClass<% end_if %>">
<div class="form__field-holder form-check">
<label class="form-check-label">
$Field
$renderField
$Title
</label>
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div id="$HolderID" class="form__fieldgroup-item checkboxfield-small form-check field field--small<% if $extraClass %> $extraClass<% end_if %>">
<label class="form-check-label">
$Field
$renderField
$Title
$RightTitle
</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<legend>$Legend</legend>
<% end_if %>
<% loop $FieldList %>
$FieldHolder
$renderFieldHolder
<% end_loop %>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<% if not $Title %> form__field-holder--no-label<% end_if %>
<% if $Zebra %> form__fieldgroup-zebra<% end_if %>"
>
$Field
$renderField
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</$Tag>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div role="group" id="$HolderID" class="btn-group<% if $extraClass %> $extraClass<% end_if %>">
$Field
$renderField
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<% if $Zebra %> form__fieldgroup-zebra<% end_if %>
<% if $extraClass %> $extraClass<% end_if %>"
>
<%-- Note: _holder_small.ss overrides CompositeField.ss to force nested $SmallFieldHolder --%>
<%-- Note: _holder_small.ss overrides CompositeField.ss to force nested $renderSmallFieldHolder --%>
<% loop $FieldList %>
$SmallFieldHolder
$renderSmallFieldHolder
<% end_loop %>
</$Tag>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<% if not $Title %> form__field-holder--no-label<% end_if %>
<% if $extraClass %> $extraClass<% end_if %>"
>
$Field
$renderField
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<% loop $FieldList %>
$SmallFieldHolder
$renderSmallFieldHolder
<% end_loop %>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% loop $FieldList %>
<div class="form__fieldgroup-item">
$FieldHolder
$renderFieldHolder
</div>
<% end_loop %>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<% if $Zebra %> form__fieldgroup-zebra<% end_if %>
<% if $extraClass %> $extraClass<% end_if %>"
>
$Field
$renderField
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div id="$HolderID" class="form__fieldgroup-item field field--small action">
$Field
$renderField
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<label for="$ID" id="title-$ID" class="form__field-label">$Title</label>
<% end_if %>
<div class="form__field-holder<% if not $Title %> form__field-holder--no-label<% end_if %>">
$Field
$renderField
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<% if $Title %>
<label for="$ID" id="title-$ID" class="form__fieldgroup-label">$Title</label>
<% end_if %>
$Field
$renderField
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<fieldset>
<% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %>
$FieldHolder
$renderFieldHolder
<% end_loop %>
<div class="clear"><!-- --></div>
</fieldset>

<% if $Actions %>
<div class="btn-toolbar">
<% loop $Actions %>
$Field
$renderField
<% end_loop %>
</div>
<% end_if %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<label for="$ID" id="title-$ID" class="form__field-label">$Title</label>
<% end_if %>
<div class="form__field-holder<% if not $Title %> form__field-holder--no-label<% end_if %>">
$Field
$renderField
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<% if $FieldList %>
<div class="selection-group selection-group__item__fieldlist" id="$ID">
<% loop $FieldList %>
$Fieldholder
$renderFieldholder
<% end_loop %>
</div>
<% end_if %>
Expand All @@ -23,7 +23,7 @@
<% if $FieldList %>
<div class="selection-group selection-group__item__fieldlist" id="$ID">
<% loop $FieldList %>
$FieldHolder
$renderFieldHolder
<% end_loop %>
</div>
<% end_if %>
Expand Down
4 changes: 2 additions & 2 deletions themes/cms-forms/templates/SilverStripe/Forms/TabSet.ss
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<div class="tab-content">
<% loop $Tabs %>
<% if $Tabs %>
$FieldHolder
$renderFieldHolder
<% else %>
<div $getAttributesHTML("class") class="tab-pane $extraClass">
<% loop $Fields %>
$FieldHolder
$renderFieldHolder
<% end_loop %>
</div>
<% end_if %>
Expand Down

0 comments on commit f9dfc78

Please sign in to comment.