From 0f4ceb94fc555327b9c26832e5d16f3f63c79bd6 Mon Sep 17 00:00:00 2001 From: Jamie Barker Date: Wed, 27 May 2015 11:33:57 +1200 Subject: [PATCH 1/4] Update composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 064f2b3..a3921a6 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "burnbright/silverstripe-members", + "name": "nimeso/silverstripe-members", "description": "Silverstripe extra member features. Registration page, profile page, send temp password.", "type": "silverstripe-module", "license": "BSD-3-Clause", From f14cede4011c21b2358fe8a3d7e332daf6471ca9 Mon Sep 17 00:00:00 2001 From: Jamie Barker Date: Wed, 27 May 2015 11:44:40 +1200 Subject: [PATCH 2/4] fix profileLink --- code/extensions/MemberProfileExtension.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/extensions/MemberProfileExtension.php b/code/extensions/MemberProfileExtension.php index 25a9f73..b490d94 100644 --- a/code/extensions/MemberProfileExtension.php +++ b/code/extensions/MemberProfileExtension.php @@ -12,7 +12,7 @@ public function updateCMSFields(FieldList $fields) { ); } - public function ProfileLink($action = null) { + public function getProfileLink($action = null) { if($directorypage = MembersDirectoryPage::get()->first()){ return Controller::join_links( $directorypage->Link(), @@ -22,7 +22,7 @@ public function ProfileLink($action = null) { ); } return Controller::join_links( - MemberProfilePage_Controller::config()->url_segment, + Director::baseURL().MemberProfilePage_Controller::config()->url_segment, $action ); } From 9d77e60bc71cc4b81431216e4b2cd82bf3536ba9 Mon Sep 17 00:00:00 2001 From: Jamie Barker Date: Wed, 27 May 2015 11:59:35 +1200 Subject: [PATCH 3/4] fix profile url, fix onRegister function --- code/extensions/MemberProfileExtension.php | 5 +---- code/forms/MemberRegistrationForm.php | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/extensions/MemberProfileExtension.php b/code/extensions/MemberProfileExtension.php index b490d94..d6cf1e6 100644 --- a/code/extensions/MemberProfileExtension.php +++ b/code/extensions/MemberProfileExtension.php @@ -21,10 +21,7 @@ public function getProfileLink($action = null) { $action ); } - return Controller::join_links( - Director::baseURL().MemberProfilePage_Controller::config()->url_segment, - $action - ); + return Director::baseURL().MemberProfilePage_Controller::config()->url_segment; } //allow content editors to CVED (CRUD) diff --git a/code/forms/MemberRegistrationForm.php b/code/forms/MemberRegistrationForm.php index cf29c8d..219ffaf 100644 --- a/code/forms/MemberRegistrationForm.php +++ b/code/forms/MemberRegistrationForm.php @@ -47,7 +47,7 @@ public function register($data, $form){ $member = Member::create(); $form->saveInto($member); $member->write(); - $this->extend('onRegister'); + $this->extend('onRegister',$member); $member->logIn(); if($back = Session::get("BackURL")){ From 8944b4779efc8d657971af8763f3b14a745318ef Mon Sep 17 00:00:00 2001 From: helpfulrobot Date: Thu, 24 Mar 2016 20:33:19 +1300 Subject: [PATCH 4/4] Added standard .editorconfig file --- .editorconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..47ae637 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,17 @@ +# For more information about the properties used in this file, +# please see the EditorConfig documentation: +# http://editorconfig.org + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[{*.yml,package.json}] +indent_size = 2 + +# The indent size used in the package.json file cannot be changed: +# https://github.com/npm/npm/pull/3180#issuecomment-16336516