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

Merge branch '4.10' into 4

Browse Source
This commit is contained in:
Steve Boyd 2022-01-19 16:03:42 +13:00
commit 511b8a4c71
5 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Forms/FormField.php
View File

@ -1355,13 +1355,14 @@ class FormField extends RequestHandler
$field = $classOrCopy::create($this->name);
}
$extraClasses = $this->extraClasses ? array_values($this->extraClasses) : [];
$field
->setValue($this->value)
->setForm($this->form)
->setTitle($this->Title())
->setLeftTitle($this->LeftTitle())
->setRightTitle($this->RightTitle())
->addExtraClass($this->extraClass) // Don't use extraClass(), since this merges calculated values
->addExtraClass(implode(' ', $extraClasses)) // Don't use extraClass(), since this merges calculated values
->setDescription($this->getDescription());
// Only include built-in attributes, ignore anything set through getAttributes().

5
src/Security/Member.php
View File

@ -937,6 +937,11 @@ class Member extends DataObject
$this->Locale = i18n::config()->get('default_locale');
}
// Ensure FailedLoginCount is non-negative
if ($this->FailedLoginCount < 0) {
$this->FailedLoginCount = 0;
}
parent::onBeforeWrite();
}

8
tests/php/Forms/FormFieldTest.php
View File

@ -259,6 +259,14 @@ class FormFieldTest extends SapphireTest
$this->assertStringNotContainsString('readonly="readonly"', $field->getAttributesHTML());
}
public function testReadonlyPreservesExtraClass()
{
$field = new FormField('MyField');
$field->addExtraClass('myextraclass1')->addExtraClass('myextraclass2');
$field->setReadonly(true);
$this->assertStringContainsString('myextraclass1 myextraclass2', $field->getAttributesHTML());
}
public function testDisabled()
{
$field = new FormField('MyField');

4
tests/php/Forms/TreeMultiselectFieldTest.php
View File

@ -203,7 +203,7 @@ class TreeMultiselectFieldTest extends SapphireTest
$this->assertSame('TreeDropdownField', $schemaDataDefaults['component']);
$this->assertSame(sprintf('%s_Holder', $field->ID()), $schemaDataDefaults['holderId']);
$this->assertSame('Test tree', $schemaDataDefaults['title']);
$this->assertSame('treemultiselectfield_readonly multiple searchable', $schemaDataDefaults['extraClass']);
$this->assertSame('treemultiselectfield_readonly multiple searchable', $schemaDataDefaults['extraClass']);
$this->assertSame('field/TestTree/tree', $schemaDataDefaults['data']['urlTree']);
$this->assertSame(true, $schemaDataDefaults['data']['showSearch']);
$this->assertSame('(Search or choose File)', $schemaDataDefaults['data']['emptyString']);
@ -239,7 +239,7 @@ class TreeMultiselectFieldTest extends SapphireTest
$this->assertSame('TreeDropdownField', $schemaDataDefaults['component']);
$this->assertSame(sprintf('%s_Holder', $field->ID()), $schemaDataDefaults['holderId']);
$this->assertSame('Test tree', $schemaDataDefaults['title']);
$this->assertSame('treemultiselectfield_readonly multiple searchable', $schemaDataDefaults['extraClass']);
$this->assertSame('treemultiselectfield_readonly multiple searchable', $schemaDataDefaults['extraClass']);
$this->assertSame('field/TestTree/tree', $schemaDataDefaults['data']['urlTree']);
$this->assertSame(true, $schemaDataDefaults['data']['showSearch']);
$this->assertSame('(Search or choose File)', $schemaDataDefaults['data']['emptyString']);

9
tests/php/Security/MemberTest.php
View File

@ -1270,6 +1270,15 @@ class MemberTest extends FunctionalTest
}
}
public function testFailedLoginCountNegative()
{
/** @var Member $member */
$member = $this->objFromFixture(Member::class, 'test');
$member->FailedLoginCount = -1;
$member->write();
$this->assertSame(0, $member->FailedLoginCount);
}
public function testMemberValidator()
{
// clear custom requirements for this test