Commit Graph

432 Commits

Author SHA1 Message Date
Sean Harvey
000749a9d7 BUGFIX Revert r61631 for Translatable but kept SiteTree changes instact from that revision since they are still useful
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@61815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:33 +13:00
Michael Andrewartha
0f615b7bc6 API CHANGE: Decorators on SiteTree can now define updateCMSActions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@61625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:33 +13:00
Michael Andrewartha
3989cb9eee API CHANGE: Decorators on SiteTree can now define updateCMSActions
BUGFIX: Don't show publish button when editing translatable page, as it is broken

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@61624 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:33 +13:00
Michael Andrewartha
8041948e65 merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@60651 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:39:33 +13:00
Josh Kosmala
a3274c9a31 Overwriting Date.php to output US Date format
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@59710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:37:46 +13:00
Andrew O'Neil
9aaa4064ae BUGFIX #2504 - Fixed translation interface not working in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@54465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:46 +13:00
Will Rossiter
c063363b23 Don't mark a test site as being in dev mode if set_test_servers matches
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@53366 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:45 +13:00
Sam Minnee
4005bc6fc5 Made has_one, has_many, and many_many methods more reliable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@53068 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:44 +13:00
Sam Minnee
1ccaefaf16 Make double-redirects a warning rather than an error, since they are usually benign.
Don't redirect from /home to / if you've already called a redirection.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@53059 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:43 +13:00
Sam Minnee
6edc1b6f99 Fixed ContentController where ->dataRecord is empty
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52712 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:43 +13:00
Sam Minnee
b3128b280f Don't strtolower ->action, as it had too many side-effects.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52445 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:43 +13:00
Sam Minnee
4ea643b2e2 #2387 - Fields specified in DataObjectDecor not saved in some cases
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52441 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:43 +13:00
Sam Minnee
cbd6d34b36 Fix to ManifestBuilder when running site on windows in a directory containing \r or \t or \n
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:42 +13:00
Ingo Schommer
13670979ac BUGFIX disable third party browscap by default (#2336)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52387 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:42 +13:00
Sam Minnee
38b489ce26 Show security id errors on test sites as well as dev
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52384 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:42 +13:00
Sam Minnee
f634ac7e58 Improved behaviour of contentcontrollerInit when extensions are applied to subclasses of SiteTree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52343 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:41 +13:00
Sam Minnee
72eb00f4b1 #2314 - Fixed SQLMap implementation so that Group::map() returns appropriate data, and the group dropdown on the access tab works.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52217 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:39 +13:00
Sam Minnee
e04de594af Make Object::hasMethod() and Object::__call() case-insensitive, and added tests for it
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@51455 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:38 +13:00
Sam Minnee
6dac7dfee2 Fixed HomepageForDomain behaviour when entering multiple domains
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@51429 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:38 +13:00
Ingo Schommer
ab92e9ef01 Merged revisions 50957 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/trunk

........
  r50957 | ischommer | 2008-03-12 22:34:27 +1300 (Wed, 12 Mar 2008) | 1 line
  
  #2283 Permissions are a bit broken - what happened to all the CMS permissions?
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50951 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:38 +13:00
Ingo Schommer
3e4cb5eea4 Merged revisions 50949 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/trunk

........
  r50949 | ischommer | 2008-03-12 22:21:49 +1300 (Wed, 12 Mar 2008) | 1 line
  
  FEATURE added hasDatabaseField()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50943 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:37 +13:00
Sam Minnee
9d902aa8cd Merged revisions 50641,50645,50815 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk

........
  r50641 | mrickerby | 2008-03-06 14:21:47 +1300 (Thu, 06 Mar 2008) | 1 line
  
  fixing typo in parameter name $validate --> $validator
........
  r50645 | mrickerby | 2008-03-06 15:06:47 +1300 (Thu, 06 Mar 2008) | 1 line
  
  made $messageType parameter of Validator::validationError optional, and added API docs to explain what (apparently) is going on
........
  r50815 | mrickerby | 2008-03-11 10:48:13 +1300 (Tue, 11 Mar 2008) | 1 line
  
  fixing bug with in-memory child objects not having their parent ID field updated via the ->add() method
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:37 +13:00
Ingo Schommer
c1fc0bcaaa Merged revisions 50838 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/trunk

........
  r50838 | ischommer | 2008-03-11 13:39:44 +1300 (Tue, 11 Mar 2008) | 1 line
  
  fixed PHP notices
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:36 +13:00
Ingo Schommer
f70dfdcbaa documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:36 +13:00
Ingo Schommer
f369a2bb4d added $searchable_fields in preparation for a more generic search implementation, currently limited to Member.php and MemberTableField.php (mainly to fix bugs caused by r49774 and r47856)
fixed weird indentation formatting in Member.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:36 +13:00
Sam Minnee
72a8fb3f03 Added 'anchor' option to link inserter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:36 +13:00
Ingo Schommer
c5dd22d7d2 added database indexes for AuthorID and PublisherID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50716 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:36 +13:00
Andrew O'Neil
a089e77a28 #2295 - DataObjectSets cannot be iterated over multiple times concurrently
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:36 +13:00
Sam Minnee
8cfb7bce21 #2277 - Fixed notice-level error on controllers that are direct subclasses of controller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50345 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:36 +13:00
Sam Minnee
b1480d5a56 Small fix for session bugs on Lightspeed server
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50238 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:35 +13:00
Sam Minnee
d59b8154be Allow use of on controller extensions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:35 +13:00
Sam Minnee
5fd878e19f Fixed 4.1-sort-by-group-aggregate query rewriter for sort functions containing columns, eg, ORDER BY if(A,B,C), X
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:34:35 +13:00
Sam Minnee
7779e1c2b0 Fixed MySQL 4.1 support for situations where we are sorting by a group aggregation function
Fixed notice level error 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49992 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-22 00:45:50 +00:00
Ingo Schommer
541c8a8904 Merged revisions 49946 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49946 | ischommer | 2008-02-21 15:21:48 +1300 (Thu, 21 Feb 2008) | 1 line
  
  fixed caching in getManyManyComponents (see r43848)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-21 02:23:39 +00:00
Mark Rickerby
24bd071767 removed redundant error strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 23:01:02 +00:00
Mark Rickerby
6966328cd5 Added a default exception handler. Any uncaught exceptions thrown from application code are now scooped up by the Debug::fatalHandler
Still some small problems with displaying stack traces of exceptions because the context array from trigger_error looks quite different from that of Exception::getTrace

Also fixed a couple of echo/print bugs in Debug::friendlyError. From the looks of the code there may be more bugs to cleanup here.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 21:37:22 +00:00
Sam Minnee
ecdc4d5cbf Fixed Controller::allowed_actions documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:49:35 +00:00
Sam Minnee
3e2fdf49f0 Improved allowed_actions support for subclassed controllers, such as CMSMain extends LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49886 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:39:53 +00:00
Ingo Schommer
20b0a8ef6e Merged revisions 49843 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49843 | ischommer | 2008-02-20 12:03:49 +1300 (Wed, 20 Feb 2008) | 1 line
  
  added $casting for BaseHref()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 23:04:12 +00:00
Sam Minnee
49db7da7c6 Merged revisions 49732 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r49732 | sminnee | 2008-02-19 10:27:49 +1300 (Tue, 19 Feb 2008) | 1 line
  
  Updated subject line of warning/error emails
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:49:57 +00:00
Sam Minnee
c422a6c43c Disabled notice level error until more of the core is compliant
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49796 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:47:21 +00:00
Sam Minnee
f11383c2fa Merged revisions 48376 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r48376 | sminnee | 2008-01-22 10:52:32 +1300 (Tue, 22 Jan 2008) | 1 line
  
  Moved CMS page-disabled logic into SiteTree::CMSTreeClasses(), so that it can be more easily customised for specific sites
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49794 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:39:45 +00:00
Sam Minnee
7babce4a66 Merged revisions 45750 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r45750 | sminnee | 2007-11-27 17:45:36 +1300 (Tue, 27 Nov 2007) | 1 line
  
  Fixed DataObjectSet::insertFirst() - it now uses a numeric key rather than null
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49791 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:37:50 +00:00
Sam Minnee
84d1d57df5 Merged revisions 45654 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r45654 | sminnee | 2007-11-26 17:00:26 +1300 (Mon, 26 Nov 2007) | 2 lines
  
  Redirect to legislation section when there are only legislation pages
  Allow selection of folder when inserting files / images
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:36:26 +00:00
Sam Minnee
2a5314685a Merged revisions 43980 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r43980 | sminnee | 2007-10-30 11:37:43 +1300 (Tue, 30 Oct 2007) | 1 line
  
  Minor bugfixes
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:33:39 +00:00
Sam Minnee
9f57b7830b Changed DataObject to be a subclass of ViewableData instead of Controller, so that it can't be hacked by visiting Page/write.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49760 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:06:24 +00:00
Sam Minnee
5b1436eaa4 #2200 - Allowed subclasses in ComponentSet::add/remove
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49708 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-18 05:19:22 +00:00
Sam Minnee
1273671cdf #1878: wakeless: Supress disabled errors on live site
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-18 05:06:39 +00:00
Matt Peel
4f8d656067 Merged r49479 from branches/2.1.1-madebyme
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49651 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-17 22:21:39 +00:00
Matt Peel
90c0b9f9fc Merged r46528 from branches/2.1.1-madebyme
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-17 22:21:03 +00:00