Commit Graph

2206 Commits

Author SHA1 Message Date
Ingo Schommer
958ad1c4e0 MINOR Merged r66794 from trunk (related to #3192)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67213 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:41 +13:00
Andrew O'Neil
c305bf3e1e BUGFIX: Fixed incorrect permission checking when the current member isn't being used
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67199 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:41 +13:00
Andrew O'Neil
2132e8e301 Merged r67152 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:41 +13:00
Will Rossiter
f746f0d74d MINOR: fixed typo in email_template docblock and added note from sean
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67188 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:41 +13:00
Ingo Schommer
81519811a8 MINOR Reverted r64384 and re-added Email_Template (see #3183)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:41 +13:00
Sam Minnee
3a619d8dbb Add TableListField::setFieldList()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:41 +13:00
Ingo Schommer
4469283166 BUGFIX Checking for "$this instanceof VirtualPage" instead of "$this->class == 'VirtualPage' to support subclassing in VirtualPage->onBeforeWrite()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67150 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:41 +13:00
Saophalkun Ponlu
9c87ec7220 BUGFIX: Fix requirements not being restored after an email is sent
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67147 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:41 +13:00
Ingo Schommer
933ade1692 BUGFIX Checking for existence of $this->record in VirtualPage_Controller->init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67140 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
d4265a0165 ENHANCEMENT Added TreeDropdownField->refresh() js method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67139 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
0ad968090a ENHANCEMENT Allowing usage of extraClass() in TreeDropdownField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Andrew O'Neil
a037a24148 BUGFIX: Fix publishing of error pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Saophalkun Ponlu
080be5ef98 Moved LegacyIDs from BlogEntry and File to Decorators
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Saophalkun Ponlu
39e386bbe7 Added LegacyID for keeping orginal ID. Used for site migration
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Sean Harvey
88d7a32017 BUGFIX Put the order of save and publish buttons back to normal (so save and publish are next to eachother)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
b1846439a7 MINOR removed debug code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
78406d7c1f ENHANCEMENT Moving "save" and "delete" cms actions from CMSMain->EditForm() into SiteTree->getCMSActions() to make them decoratable (e.g. disallow delete action) and easier to cover with unit tests. Leaving fallback "save" and "delete" actions in CMSMain in case no actions are defined (necessary e.g. for Group class in SecurityAdmin)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67061 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Sam Minnee
7671dc644b BUGFIX: Fixed Enum::scaffoldSearchForm() to always include an (All) option
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67045 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
b12476f1ad ENHANCEMENT Added SearchForm->setPageLength() and SearchForm->getPageLength()
MINOR Deprecated internal property SearchForm->$numPerPage, use $pageLength instead

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Sam Minnee
c7a4afee52 BUGFIX: Fixing tests
ENHANCEMENT: Add <%-- --%> comments

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66946 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
3d5600c597 MINOR merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66944 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:40 +13:00
Ingo Schommer
3673a604c6 MINOR merged r66670 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Sam Minnee
3d93a23f52 Fixed SiteTreePermissionsTest login failure tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Ingo Schommer
ae62681706 MINOR Merged r66681 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66939 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Sam Minnee
7cce6782bc BUGFIX #3115 ajshort: Fixed backslashes in temp folder location in manifest builder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Sam Minnee
8671b022e4 BUGFIX: Friendlier error when you have a site running on a PHP4 server, or a server without PHP.
API CHANGE: Move some of the installer into the sapphire directory.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66894 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Andrew O'Neil
025d2b2498 BUGFIX: Don't make blank dates show 1/1/1970
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66891 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Sam Minnee
1aeaed7fc4 Better checking of tabstrip stuff
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Sam Minnee
331a427796 BUGFIX: Better generation of PastMember cookie when you have stale login info
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Sam Minnee
89276d7852 Removed call-time pass by reference from CsvBulkLoader
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66834 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Ingo Schommer
9bf329dd5e ENHANCEMENT Disabled sending of warnings through Debug::send_errors_to() by default. If you need extended error reporting including warnings (e.g. for a site which is still in active development), use Debug::send_errors_to('example@example.com', true) or Debug::send_warnings_to('example@example.com')
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66830 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +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
Sean Harvey
6808b8b26c BUGFIX Added extension to email address when accessing Security/passwordsent since the . (dots) are split into extensions when the URL is parsed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Sean Harvey
4a145c4e1b MINOR Code formatting conventions in HTTPRequest->param()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Ingo Schommer
322fa2a547 BUGFIX Returning a boolean instead of Permission IDs in specific SiteTree->canEdit() case
BUGFIX Passing through $member param from SiteTree->canPublish() to SiteTree->canEdit()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66740 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:39 +13:00
Ingo Schommer
61c58014c1 MINOR Formatting in Permission::checkMember()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Will Rossiter
18178c3e79 BUGFIX: fixed typo in filesystem
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sam Minnee
edc29eddef BUGFIX: Fixed notice-level errors in PhoneNumberField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66707 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Ingo Schommer
524a003d24 MINOR merged r66672 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66700 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sean Harvey
02457ed0d4 BUGFIX Fixed sake bug when checking for an argument in bash script. Ticket #3112. Thanks simon_w.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66698 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Ingo Schommer
93dd7600df ENHANCEMENT Renamed tab "Meta-data" to "Metadata" for better readability (see #3142)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Ingo Schommer
29c2757841 ENHANCEMENT Fixed default level in HeaderField - was duplicating defaults already present in two other places (see r66639)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66646 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sam Minnee
be6e67a20f DataObject::relObject() throws an exception rather than an error so that it can be caught
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66645 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sean Harvey
7874d09771 MINOR Removed redundant code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sam Minnee
5f189c42da Set default level for HeaderField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66639 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:38 +13:00
Sean Harvey
0d450e6c3a BUGFIX Fixed flaw logic checking for $member variable, since it's always set the alternative for choosing Member::currentUser() would never work.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sean Harvey
a2d5a9ac75 MINOR Code formatting of !isset($member) on SiteTree->canAddChildren() for consistency with other can*() methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66637 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sean Harvey
8089d7b14c MINOR Renamed to correct updateCMSActions() in php comment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66636 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sean Harvey
640c50149d BUGFIX Fixed SiteTree->getCMSActions() so it returns a FieldSet, instead of a DataObjectSet. This makes it consistent with DataObject->getCMSActions() as well as SiteTree->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66635 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00
Sean Harvey
4713842790 BUGFIX Fixed SiteTree->getCMSActions() not extending properly because it was passing an array to the extend() 2nd argument, which expected a FieldSet object
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:26:37 +13:00