diff --git a/changelog.md b/changelog.md index 19fd7f7..52f3de9 100644 --- a/changelog.md +++ b/changelog.md @@ -78,4 +78,12 @@ ## 1.3.1 -* Ensure that only one of each user group is created on build \ No newline at end of file +* Ensure that only one of each user group is created on build + +## 1.3.2 + +* Change default contact group tag matches what is converted by SilverStripe + +## 1.3.3 + +* Ensure groups are using a compatible code when initially creating. \ No newline at end of file diff --git a/src/extensions/GroupExtension.php b/src/extensions/GroupExtension.php index b76248a..24908a1 100644 --- a/src/extensions/GroupExtension.php +++ b/src/extensions/GroupExtension.php @@ -2,10 +2,11 @@ namespace SilverCommerce\ContactAdmin\Extensions; +use SilverStripe\ORM\DB; +use SilverStripe\Core\Convert; use SilverStripe\Security\Group; use SilverStripe\ORM\DataExtension; use SilverCommerce\ContactAdmin\Helpers\ContactHelper; -use SilverStripe\ORM\DB; /** * Scaffold Any Default User Groups @@ -22,6 +23,8 @@ public function requireDefaultRecords() continue; } + $code = Convert::raw2url($code); + $existing = Group::get()->find('Code', $code); if (!empty($existing)) { @@ -29,10 +32,9 @@ public function requireDefaultRecords() continue; } - $group = Group::create([ - 'Code' => $code, - 'Title' => $title - ]); + $group = Group::create(); + $group->Code = $code; + $group->Title = $title; $group->write(); DB::alteration_message('Created group ' . $title, 'created'); diff --git a/src/helpers/ContactHelper.php b/src/helpers/ContactHelper.php index e2f2c2b..b14064e 100644 --- a/src/helpers/ContactHelper.php +++ b/src/helpers/ContactHelper.php @@ -51,7 +51,7 @@ class ContactHelper * @var array */ private static $default_user_groups = [ - 'contact_users' => 'Contact Users' + 'contact-users' => 'Contact Users' ]; /**