Commit Graph

129 Commits

Author SHA1 Message Date
Ingo Schommer
d26f08b481 MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@67465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:32 +00:00
Ingo Schommer
b65f74a37f ENHANCEMENT Allowing to pass $member parameter into Member->canEdit()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66680 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-25 22:34:57 +00:00
Sam Minnee
96c5be8252 Updating queries to be more DB agnostic
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-24 09:31:14 +00:00
Sam Minnee
93438e0be2 API CHANGE: Adding double quotes to all table and field references (a work in progress)
API CHANGE: DataObject::get()'s GROUP BY clause is only generated for MySQL as it needs to be improved for other databases to accept it.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 23:28:16 +00:00
Sam Minnee
a3d3fb65a9 Updated SQL queries to be ansi compatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 00:31:06 +00:00
Sam Minnee
2984355f43 Merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-22 03:33:00 +00:00
Sam Minnee
3d9532db83 Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:37 +00: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
Sam Minnee
8d62fbf1aa Fixed bug in Member::mapInCMSGroups()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-18 00:51:55 +00:00
Sam Minnee
b4c593e63d Added warnings for parts of Member that require the newsletter module. Note that this code should really be moved to the newsletter module at some stage.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-17 22:24:57 +00:00
Ingo Schommer
e7cbdbc07d BUGFIX Fixed $this reference in static Member call
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-14 03:30:32 +00:00
Sam Minnee
9dcb89bf51 Removed warning when session_regenerate_id can't be set. It's not strictly necessary and just causes testing headaches
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 02:31:11 +00:00
Sam Minnee
48b60fa710 Improvements to better allow for CLI-based testing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60577 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 01:43:09 +00:00
Hayden Smith
78c2615821 Refactored [47082]: Modified Member::mapInCMSGroups to make use of CMSMain::providePermissions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60522 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 22:14:36 +00:00
Hayden Smith
ca6c248de1 Merged [47069]: Replaced explicit calls to AccessLogEntry::create with more flexible calls to extensions. AccessLogEntry to be refactored into separate module.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 20:59:32 +00:00
Hayden Smith
5be532e96d Refactored [47068]: Member::logOut now calls memberLoggedOut on any extensions on Member.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60498 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 05:59:15 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:51:33 +00:00
Sam Minnee
eb9e66808c API CHANGE: Renamed static Member::autologinhash() to static Member::member_from_autloginhash() to be more in line with naming convnetions, and not conflict with Member.AutoLoginHash in the database
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:18:18 +00:00
Ingo Schommer
1077cbf08f MINOR Removed debug code from Member.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:05:48 +00:00
Ingo Schommer
382f34c69b (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:10:59 +00:00
Ingo Schommer
2d8434a43f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:57:59 +00:00
Ingo Schommer
03fcc80e19 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:19:54 +00:00