Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make compatible with SilverStripe 4.0 #136

Closed
wants to merge 2 commits into from
Closed

make compatible with SilverStripe 4.0 #136

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
863d030
make compatible with Silverstripe 4.0
wtajak Dec 22, 2017
eb0b0ff
remove custom field code
wtajak Dec 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions _config/extensions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
Name: extensions
---
Member:
extensions:
['MemberProfileExtension']
---
Name: extensions
---
SilverStripe\Security\Member:
extensions:
['Silverstripe\MemberProfiles\MemberProfileExtension']
22 changes: 18 additions & 4 deletions code/MemberProfileField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,22 @@
/**
* @package silverstripe-memberprofiles
*/

namespace Silverstripe\MemberProfiles;
use SilverStripe\ORM\DataObject;
use SilverStripe\View\Requirements;
use SilverStripe\Forms\ReadonlyField;
use SilverStripe\Forms\HeaderField;
use SilverStripe\Forms\DropdownField;
use SilverStripe\Forms\TextField;
use SilverStripe\Core\Config\Config;
use Silverstripe\MemberProfiles\MemberProfilePage;
use SilverStripe\Security\Member;

class MemberProfileField extends DataObject {

private static $table_name = 'MemberProfileField';

private static $db = array (
'ProfileVisibility' => 'Enum("Edit, Readonly, Hidden", "Hidden")',
'RegistrationVisibility' => 'Enum("Edit, Readonly, Hidden", "Hidden")',
Expand All @@ -21,7 +35,7 @@ class MemberProfileField extends DataObject {
);

private static $has_one = array (
'ProfilePage' => 'MemberProfilePage'
'ProfilePage' => MemberProfilePage::class
);

private static $summary_fields = array (
Expand Down Expand Up @@ -176,7 +190,7 @@ public function getDefaultTitle($force = true) {

protected function getMemberFields() {
if (!self::$member_fields) {
self::$member_fields = singleton('Member')->getMemberFormFields();
self::$member_fields = singleton(Member::class)->getMemberFormFields();
}
return self::$member_fields;
}
Expand All @@ -187,15 +201,15 @@ protected function getMemberFields() {
public function isAlwaysRequired() {
return in_array (
$this->MemberField,
array(Config::inst()->get('Member', 'unique_identifier_field'), 'Password')
array(Config::inst()->get(Member::class, 'unique_identifier_field'), 'Password')
);
}

/**
* @return bool
*/
public function isAlwaysUnique() {
return $this->MemberField == Config::inst()->get('Member', 'unique_identifier_field');
return $this->MemberField == Config::inst()->get(Member::class, 'unique_identifier_field');
}

/**
Expand Down
Loading