Commit Graph

4205 Commits

Author SHA1 Message Date
Sam Minnee
1d61bf7100 BUGFIX Prevent handling of controller actions which return $this avoid infinite loops in RequestHandler->handleRequest (thanks Hamish!) (from r102004)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112054 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:24:53 +00:00
Sam Minnee
740e49061f API CHANGE Disallow methods/actions in RequestHandler->checkAccessAction() which are implemented on parent classes (e.g. ViewableData and Object), unless access is controlled through $allowed_actions. This limits information exposure from getters used in template contexts. (from r102003)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112053 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:24:15 +00:00
Sam Minnee
d99c2c7ee4 BUGFIX Resetting image sidepanel fields when opening the panel instead of inserting an image, to avoid losing focus of TinyMCE in IE. Using getBookmark() in TinyMCE to save the original location. (fixes #5263) (from r101975)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:23:29 +00:00
Sam Minnee
e2d17d9b99 MINOR: Fix tests to cope with ID type cleanup changed recently (from r101970)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112051 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:23:07 +00:00
Sam Minnee
28c2c67355 BUGFIX Checking for existing redirections in FormResponse::respond (fixes #5208) (from r101958)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112050 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:21:45 +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
5fd242a25b MINOR TreeTitle really should return title, not name. (from r101882)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112047 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:17:06 +00:00
Sam Minnee
05404dea1b MINOR: Added missing file for r101867 (from r101868)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112046 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:16:41 +00:00
Sam Minnee
34207e069a BUGFIX #4188 simon_w: Let require tags in templates be conditional (from r101867)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:15:47 +00:00
Sam Minnee
3ba0434d6d BUGFIX: Recover if a manifestClassParse file doesn't have the necessary content. (from r101866)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112043 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:15:13 +00:00
Sam Minnee
c5c7dee5f0 API CHANGE: Allow cached blocks within control and if blocks, as long as that control or if block is contained within an uncached block, not a cached block (from r101833)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112042 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:14:49 +00:00
Sam Minnee
5e204bc6e0 BUGFIX: Added allowed_actions to ContentControllerSearchExtension (from r101812)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112041 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:14:27 +00:00
Sam Minnee
7d765fc5c6 MINOR Fixed JSONDataFormatter excaping (fixes #5309, thanks briley) (from r101811)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112040 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:10:53 +00:00
Sam Minnee
6f3866936d BUGFIX: fixed undefined error in CTFs. BUGFIX: added action class to actions to allow the popup hook to open links (from r101807)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112039 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:10:05 +00:00
Sam Minnee
1a12f98382 BUGFIX avoid call to non-object (from r101794)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112038 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:09:02 +00:00
Sam Minnee
ca5c2323a1 BUGFIX: preserve the port value if given in HTTP::setGetVar (#5280). BUGFIX: allow username only input rather than user:pass combo. (from r101793)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112037 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:08:10 +00:00
Sam Minnee
2996e2a60d BUGFIX: disable function re-enabled (from r101792)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:07:35 +00:00
Sam Minnee
068e1d63e0 BUGFIX: deprecated split function replaced (from r101791)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:07:11 +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
aa5fc3d80e BUGFIX fix #5320 (from r101758)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112033 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:06:22 +00:00
Sam Minnee
328b3d25dd MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields (from r101751)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:05:29 +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
7fc63deda0 MINOR: use red font instead of gray when displaying error (from r101729)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112029 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:03:46 +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
b88f462664 MINOR Fixed tab naming in Group->getCMSFields() (from r101718)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112026 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:02:00 +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
ddeebf3b7b MINOR Respecting folder sort order in admin/assets by adding Folder::$default_sort="Sort" (#5235) (from r101698)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112024 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:01:12 +00:00
Sam Minnee
d25e326ba0 MINOR Removed fullstop where it wasn't needed (from r101688)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112023 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:00:24 +00:00
Sam Minnee
c4e8624794 MINOR Tidied up the layout of the Themes area of the installer slightly - now consistent helptext as other areas (from r101687)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112022 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:59:55 +00:00
Sam Minnee
d3129b8964 MINOR Updated CMS Admin Account text to be more precise (from r101686)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112021 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:59:23 +00:00
Sam Minnee
d07297aa46 MINOR Altered wording in installer for localised interface (from r101683)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112019 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:58:55 +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
5aa012335a ENHANCEMENT: tidied up installer process to streamline process. Moved requirements to top and button to bottom and added visual seperation of the individual steps (from r101661)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112015 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:57:05 +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
4414b8a747 BUGFIX #5243 Undefined Convert functions in ViewableData replaced with working versions. Thanks benediktb!
MINOR Updated ViewableDataTest to verify ViewableData changes (from r101638)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112013 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:56:04 +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
1e860727db BUGFIX: put back into the SSNavigator the archived site link (#5251) (from r101623)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112011 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:55:11 +00:00
Sam Minnee
6f693570be MINOR Made the default database directory relative to assets ".db" which is more precise than ".sqlitedb" (from r101619)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112010 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:54:45 +00:00
Sam Minnee
2bf9d6f376 MINOR Made SQLite path in installer use DIRECTORY_SEPARATOR so it shows as correct on Windows using backslashes instead of forwardslashes - this is more of a cosmetic thing, as slashes can be interchanged and still parsed correctly by PHP (from r101618)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112009 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:52:53 +00:00
Sam Minnee
3ac1580aae BUGFIX: Explicitly specify the many_many's join table name in the join's ON match statement in ManyManyComplexTableField (from r101608)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:51:33 +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
9246add340 MINOR: fixed notice level error (from r101600)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112005 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:50:16 +00:00
Sam Minnee
472dbf3e32 BUGFIX: get a object inside transaction block will alway exist (from r101592)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112004 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:49:57 +00:00
Sam Minnee
df0e553eee BUGFIX: tables and column quoted properly (from r101554)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:48:57 +00:00
Sam Minnee
51c9fa8a45 BUGFIX: tables and column quoted properly (from r101493)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:47:41 +00:00
Sam Minnee
0ec9d0e48f BUGFIX: results sorted alphabetically for consistency (from r101492)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 00:47:22 +00:00