Commit Graph

1199 Commits

Author SHA1 Message Date
Sam Minnee
2948bc1c64 MINOR: Misc merges from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112142 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:53:12 +00:00
Sam Minnee
90514f2ae3 BUGFIX: Don't show error when adding default SiteConfig records after upgrading a site. (from r103341)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:44:14 +00:00
Sam Minnee
1379f133ea MINOR Enum DBField class should default to ExactMatchFilter to avoid wrong results with overlapping Enum values in LIKE queries (see #5434) (from r103322)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112132 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:40:36 +00:00
Sam Minnee
37f18971c5 ENHANCEMENT: allow onAfterPublish and onBeforePublish handlers directly on Page classes (#5112) (from r103198)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:35:19 +00:00
Sam Minnee
0914dd55c5 ENHANCEMENT: allow to check for any changed fields on the DataObject, this is expected behaviour when isChanged function is called without parameters (#5421, patch by walec51) (from r103047)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:48:48 +00:00
Sam Minnee
322a2da0dc BUGFIX Float should always be not null and default 0 in the database (from r102686)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112068 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:45:24 +00:00
Sam Minnee
268800dec6 BUGFIX #5316 Float and Double should never try to save NULL as the "null" value (from r102460)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:43:58 +00:00
Sam Minnee
29edff8c38 BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364) (from r102386)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:41:14 +00:00
Sam Minnee
890ac94a6a MINOR: Several changes merged from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112060 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:35:19 +00:00
Sam Minnee
ddf66c1fec BUGFIX Fixed SiteTree::page_type_classes() removal of base class (was broken if database driver returned classes in arbitrary order, e.g. in Postgres) (from r102026)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112058 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:28:02 +00:00
Sam Minnee
daa50b9d3b BUGFIX: Ensure that DataObject IDs are numbers and no string equivalents of numbers - 3 not '3' (from r101939)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:19:33 +00:00
Sam Minnee
bbdad4207f MINOR take advantage of an alternate path for error pages (from r101883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112048 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:18:35 +00:00
Sam Minnee
dad17e2330 MINOR Marked DataObject::has_own_table() as static (from r101782)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112034 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:06:47 +00:00
Sam Minnee
9087f79723 BUGFIX Always including "Locale" field in Translatable->getCMSFields() regardless of "excluded" page types. Necessary to enable form state serialization for fields like TreeSelectorField on a VirtualPage (fixes #5269) (from r101747)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112031 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:05:08 +00:00
Sam Minnee
fd8e0044c4 BUGFIX Versioned->publish() with $createNewVersion=TRUE now increases version number of in-memory object (fixes #5261) (from r101739)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112030 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:04:38 +00:00
Sam Minnee
142bb640ec BUGFIX #5277 Sort of default SiteTree records is now explicitly set to avoid strange ordering set by SiteTree::onBeforeWrite for default records (from r101724)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112028 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:03:25 +00:00
Sam Minnee
1bbec96aa1 BUGFIX Don't replace "home/" URLSegment in SiteTree->RelativeLink() if Translatable is enabled and the homepage is not on the root level (nested URLs allows you to have homepages called "en/home" and "ru/home") (fixes #5244) (from r101711)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112025 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:01:38 +00:00
Sam Minnee
6ba32686b1 MINOR Reverted r101670 as it broke assumptions made in RedirectorPageTest (from r101671)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112018 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:58:39 +00:00
Sam Minnee
6490b111b6 ENHANCEMENT RedirectorPage ExternalURL field now defaults to http:// to be consistent with the "Another website" option for HtmlEditorField LinkForm (from r101670)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112017 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:58:20 +00:00
Sam Minnee
7d3d9a005e BUGFIX #5259 RedirectorPage and HtmlEditorField TinyMCE integration now prefixes http:// if no prefix is found (from r101668)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112016 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:57:45 +00:00
Sam Minnee
c08e277ba0 BUGFIX #5245 Sometimes page records will have a NULL ParentID value, it should be a number even if it's 0 (thanks wrossiter!) (from r101657)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112014 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:56:27 +00:00
Sam Minnee
f073c9b60c BUGFIX: test that the class exists before running subclass tests (from r101631)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112012 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:55:31 +00:00
Sam Minnee
ac27c7217f BUGFIX: the function makes an assumption we are working on Draft site, and breaks if we are not. Rewritten to be stage-independent, as get_version (open #5231) (from r101603)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112006 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:50:48 +00:00
Sam Minnee
0d5a0e73fe BUGFIX Checking for existence of "ShowInMenus" property in Folder->liveChildren() and stageChildren() (#5190) (from r101264)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111978 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:58:49 +00:00
Sam Minnee
8f41e08139 BUGFIX: Don't recreate a missing draft page when calling SiteTree::doUnpublish() (from r101170)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111967 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:49:52 +00:00
Sam Minnee
dd7bba3f6f BUGFIX: Fixed versioning of pages (from r101165)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111964 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:48:48 +00:00
Sam Minnee
c6b8148052 BUGFIX: Prevent failed migrateVersion writes from breaking versioning system in future writes.
BUGFIX: MAke site tree pages go green when you save a new draft.
API CHANGE: Add option for DataObjectDecorator::onAfterSkippedWrite() (from r101155)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:48:07 +00:00
Sam Minnee
79459d72ad BUGFIX: Ensure that Versioned works on classes with underscores in the names. (from r100905) (from r101153)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:42:45 +00:00
Sam Minnee
e09cc66e94 BUGFIX: Fixed issues with broekn link tracking (from r101138)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111960 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:42:25 +00:00
Ingo Schommer
3f2cc791ac MINOR More common language in Date->TimeDiff() ("in 2 hours" instead of "2 hours away") (fixes #5402)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-10 05:06:50 +00:00
Sam Minnee
d19bf168b0 API CHANGE: Added SiteTree::VirtualPages() and SiteTree::DependentPages() accessors.
BUGFIX: Improved reliabilty of broken link tracking.
ENHANCEMENT: Added 'Dependent pages' tab to CMS, to show virtuals, redirectors, and backlinks that point to this page.
BUGFIX: Don't mark a page as changed on stage if the only thing that has changed is broken link metadata (from r101127)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111594 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:52:46 +00:00
Sam Minnee
bfc354ab7e BUGFIX: Flush cache after deleting an item.
BUGFIX: Fixed databaseFieldsOnly version of DataObject::getChangedFields() (from r101116)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:50:43 +00:00
Sam Minnee
7426ce027c BUGFIX: Fixed bugs with copying custom fields into Virtual pages, generally made virtual pages more robust and performant. (from r101112)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111591 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:49:37 +00:00
Sam Minnee
e2b6291a30 BUGFIX: Fixed link rewriting to work on other HTMLText fields (from r99517) (from r101110)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:48:47 +00:00
Sam Minnee
ca0550bb3a BUGFIX: Return true if SiteTree:doUnpublish() succeeds. (from r99515) (from r101109)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111589 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:48:07 +00:00
Sam Minnee
cc355a4f18 API CHANGE: Replaced eval based creation of extension and field objects with Object::create_from_string().
API CHANGE: Introduced new function Object::create_from_string() to instantiate an object from a string like 'Int(50)' (from r101093)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:46:41 +00:00
Sam Minnee
ce173efce3 API CHANGE: Made MySQL fulltext search optional, activated with MySQLFulltextSearchable::enable() (from r101044)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:32:48 +00:00
Sam Minnee
ec067ab08a API CHANGE: Pass the full extension string as the 2nd argument to DataObjectDecorator::extraStatics() (from r101043)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:32:30 +00:00
Sam Minnee
47df057e63 BUGFIX Image should pass through the title to Image_Cached so that Image::getTag() can produce a more useful alt attribute instead of just the filename (from r101003) (from r101005)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111565 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:30:56 +00:00
Sam Minnee
2154e0585d MINOR Removed unused variable in SiteTree::MetaTags() (from r100992)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:30:26 +00:00
Sam Minnee
32038ab3ce BUGFIX: Remove cache for Hierarchy::AllChildren() and Hierarchy::AllChildrenIncludingDeleted(), since they increase memory usage unnecessarily. (from r100980)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:28:32 +00:00
Sam Minnee
059866556a MINOR Renamed SiteTree->getEditFormFields() to getCMSFields() (including new decorator hook for 'updateCMSFields'). Renamed SiteTree->getEditFormActions() to getCMSActions() (including new decorator hook for 'updateCMSActions'). Old API was never released (from r100967)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:27:23 +00:00
Sam Minnee
94d98b18ac ENHANCEMENT Redirecting to translated page when original is requested with a 'locale' GET parameter (e.g. 'about-us/?locale=de_DE' will redirect to 'ueber-uns' with a 301 HTTP response). Implemented in ContentController->handleRequest(). (see #5001) (from r100937)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111545 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:24:01 +00:00
Sam Minnee
37bc333882 BUGFIX SiteTree::getSiteConfig() should always fall back to using a default if an alternate config wasn't found (from r100932)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111544 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:21:59 +00:00
Sam Minnee
2e49064341 BUGFIX DataObject::hasValue() is now compatible with parent ViewableData::hasValue() (this also fixes E_STRICT standards in PHP) (from r100921)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111541 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:21:06 +00:00
Sam Minnee
a9ab6321bc BUGFIX #5138: DataObjectSet::removeDuplicates() removes objects of different classes with the same ID (from r100896)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111535 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:15:33 +00:00
Julian Seidenberg
6c541940e4 MINOR: updated comments on new methods that duplicate relations to be compatible with PHPDoc
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@110909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-09-17 02:27:44 +00:00
Julian Seidenberg
c32a6e34a0 BUGFIX: fix to #110845 to allow parsing of the DataObject file in PHP 5.2 and below.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@110863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-09-16 05:53:16 +00:00
Julian Seidenberg
ed666b71b7 ENHANCEMENT: DataObject and SiteTree duplicate now duplicate relations (except for has_many relations, as the object at the other end of such a relation has an existing relation to the original object and that should not be modified by the duplication)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@110845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-09-16 03:40:34 +00:00
Ingo Schommer
53b02f6d99 BUGFIX Moved SiteTree?->ParentID property to Hierarchy extension (fixes #5638) (from r105668)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105786 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-27 21:29:48 +00:00