Commit Graph

143 Commits

Author SHA1 Message Date
Sean Harvey
756735b1ad MINOR Moved member logged in check from MemberLoginFrom to a static function Member
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:17 +13:00
Sean Harvey
ced1f25a4e BUGFIX Member::inGroup() returns false instead of an error if group doesn't exist. Ticket #3813 - thanks bgribaudo!
MINOR Updated MemberTest to test a case where a group doesn't exist, and thus we assert Member::inGroup() returns false



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74981 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:16 +13:00
Normann Lou
3861c33bc1 APICHANGE: add documentation to changeset r74858.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:15 +13:00
Normann Lou
5c612beb36 APICHANGE: pass argument $includerelations into DataObject::fieldLabels() default as true;
APICHANGE: BulkLoader::getImportSpec() call DataObject::fieldLables() with $includerelations as false, so that the relations is separated from column fields

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:15 +13:00
Sean Harvey
26b37970f8 BUGFIX Existence check for Member autologin token (Merged from r73253)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:10 +13:00
Sam Minnee
5a602720e6 BUGFIX: Memory usage improvements to CsvBulkLoader and Member::onBeforeWrite()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72252 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:08 +13:00
Will Rossiter
479f8c0fa3 MINOR: added user friendly labels - should really be _t compatible I guess
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71345 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:06 +13:00
Sean Harvey
4d43a61605 ENHANCEMENT Allow selection of the unique identifier field on Member by setting Member::set_unique_identifier_field(AnotherField). Default is "Email".
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70861 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
29db659e7d ENHANCEMENT Removed blacklist newsletter specific code out of core and into newsletter module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Sean Harvey
04fa06a94e MINOR Code formatting cleanup in Member
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Sean Harvey
0ed2826067 ENHANCEMENT Allow Member::getCMSFields() to be extended via DataObjectDecorator->updateCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:00 +13:00
Sean Harvey
e096a037d2 MINOR Removed "Groups" field that wasn't used in Member::getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70238 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:59 +13:00
Ingo Schommer
eebab1df71 BUGFIX Making Password formfield in Member->getCMSFields() translatable
ENHANCEMENT Hiding Member->BlacklistedEmail field in getCMSFields() by default - only relevant in newsletter/bounce context at the moment

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:51 +13:00
Andrew O'Neil
55c427ad29 Restore requirements after sending email
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67583 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:46 +13:00
Ingo Schommer
c9b9275fdf BUGFIX Only setting LockedOutUntil to NULL in Member->logIn() if the column is actually present in the database. Otherwise this setting will case an UPDATE Member SQL query to fail on the first /dev/build call on a 2.2->2.3 upgrade if not in dev-mode (=requiring login) (see #3171)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67529 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:45 +13:00
Sean Harvey
c96d891c2c MINOR Removed whitespace after ?> end PHP tag
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67467 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:45 +13:00
Ingo Schommer
bc9d54a47e ENHANCEMENT Adding "close popup" link after saving /admin/myprofile (see #3195)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:43 +13:00
Ingo Schommer
bcd3c48859 BUGFIX Save default locale for new members, so the profile form doesn't show first available locale in dropdown because its defaults are overwritten by Member->Locale = NULL (see #3159)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67221 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:43 +13:00
Sam Minnee
7158a8cee4 Removed unnecessary updateCMSFields call; DataObject::getCMSFields does this for us
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66824 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Ingo Schommer
77575e69b7 BUGFIX Hiding "change password" fields by default in admin/myprofile, they shouldn't validate the input by default. Replaced with a link to toggle those fields (#3106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66334 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:36 +13:00
Sam Minnee
1c21f458ec BUGFIX: Alow decoration of Member with has_many relationships
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@65850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:31 +13:00
Sam Minnee
b39d3811ff Refactored tabstrip.js to use livequery for loading
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65717 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 22:28:07 +00:00
Sam Minnee
5f177b9f08 BUGFIX #2056: Removed all references to deprecated Member::isAdmin()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 23:31:33 +00:00
Ingo Schommer
c998006b2c MINOR Fixed PHP Notices in Member.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 13:48:04 +00:00
Ingo Schommer
e57b7651ef ENHANCEMENT Unit tests for Member->inGroup() and Member->inGroups()
ENHANCEMENT Added a "strict-mode" for Member->inGroup() and Member->inGroups() to determine true membership to a group (without inheritance)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65125 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 01:57:16 +00:00
Ingo Schommer
3edc358ead ENHANCEMENT Added fieldLabels() overloading to various DataObject subclasses. Use this method instead of directly calling _t() in getCMSFields(), and use fieldLabel('MyField') to get the label for a specific FormField. This way, we can transparently support formfield scaffolding and re-use the labels for search fields automatically.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-02 20:04:10 +00:00
Normann Lou
2c4edddd1b call $this->extend('updateFieldLabels', $labels) in FieldLabels() to get its decorator's customized field labels
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64814 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-28 04:35:34 +00:00
Ingo Schommer
768fc5a588 BUGFIX Adjusted HeaderField and LabelField implementation to new constructor arguments (see r64421)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64422 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:26:50 +00:00
Ingo Schommer
9b1db223ce API CHANGE Removed deprecated Datetime class, use SSDatetime instead (was conflicting with PHP 5.2 integrated classes)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 08:59:40 +00:00
Sean Harvey
050321cb3c MINOR Removed Group_Unsecure which was never used
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64369 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 05:43:57 +00:00
Sean Harvey
77bb01c253 ENHANCEMENT Pulled out Newsletter specific stuff from Member, the changes in the newsletter module were done on r64365
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64366 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 05:14:27 +00:00
Sean Harvey
8c48dde721 BUGFIX Reverted Member->isAdmin() removal since it's being used in a lot of places, we shouldn't deprecated it... yet.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64334 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 01:04:38 +00:00
Sean Harvey
23fe21afff API CHANGE Removed deprecated method isAdmin() on Member - use Permission::check('ADMIN') instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64330 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 01:01:27 +00:00
Sean Harvey
461b57a647 API CHANGE Removed references to CanCMS and CanCMSAdmin in Group, including references to it in Member. See ticket #2959 for more details.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 00:49:51 +00:00
Ingo Schommer
dcd77d065c BUGFIX Fixed wrong call to scaffoldCMSFields() in Member->getCMSFields(), removed addScaffoldRelationFields() call as this is done by the newly called parent::getCMSFields() already
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-14 00:29:16 +00:00
Ingo Schommer
617711c7e6 MINOR Swapped $mainFields and $fields assignments in Member->getCMSFields() to reflect what they're actually containing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64009 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-09 17:31:32 +00:00
Sam Minnee
7efd56e0dd Updated Member's getCMSFields() to consistently work with fields in a tab
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 04:17:52 +00:00
Sean Harvey
f2abae719e BUGFIX Member->getCMSFields() should use scaffoldCMSFields() instead of scaffoldFormFields() - currently it is operating in the wrong context.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 00:50:03 +00:00
Sam Minnee
686c983f3e Updated Member::isInGroup() to function as well as being deprecated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-07 04:45:01 +00:00
Ingo Schommer
6691187cac BUGFIX Translated Member formfields through fieldLabels()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63629 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 18:30:27 +00:00
Ingo Schommer
7887f0daa3 ENHANCEMENT Scaffolding Member->getCMSFields() to allow for easy extension
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63624 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 16:23:56 +00:00
Sam Minnee
7c4108d33a Added groups field on member details, so that you can add members to other group
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63546 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-02 22:11:35 +00:00
Sam Minnee
2a392ef61c Don't claim that there's an invalid password if no password is set - members may be created for newsletters, etc.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-02 02:45:58 +00:00
Ingo Schommer
17aad01848 MINOR Formatting in Member
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-01 18:32:55 +00:00
Ingo Schommer
9371f4688b ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-27 16:02:38 +00:00
Ingo Schommer
2d8656e72b API CHANGE Deprecated Member::isInGroup() - use Member::inGroup() instead
ENHANCEMENT Allowing usage of ID, Code-String or Object as $group parameter in Member::inGroup()


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-22 16:07:28 +00:00
Sam Minnee
ffcac733e9 Update test runner so that password validation config isn't tested by default
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-18 03:59:00 +00:00
Sam Minnee
56a921cd2d Removed Created from member summary fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61720 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-28 22:56:48 +00:00
Normann Lou
1dc0615f64 add Created as summary_fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-26 03:55:03 +00:00
Normann Lou
6a897d7bfa getSummaryFields() will also get those summary fields defined in Member's decorator applied to the results and export
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-26 01:45:52 +00:00