Commit Graph

4659 Commits

Author SHA1 Message Date
Sam Minnee
0c81b2f997 APICHANGE: changed the modulus offset to 1 to correctly order sets (from r103792)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112158 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:05:04 +00:00
Sam Minnee
0b4e4428be MINOR: Merges from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112157 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:04:32 +00:00
Sam Minnee
f5fb01d11b MINOR Fixed AggregateTest for MSSQLDatabase (wrong date formatting) (from r103640)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:01:20 +00:00
Sam Minnee
8da5de8d41 BUGFIX: Fixed ordering by aggregate columns for DataObject::get() calls with joins. (from r103620)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:00:52 +00:00
Sam Minnee
2c4b07ace7 BUGFIX: Fixed unlimitedRowCount() for grouped queries (from r103613)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:00:14 +00:00
Sam Minnee
5027bf83ab BUGFIX: Ensure that group by of many-many queries with extraFields is set correctly. (from r103612)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:59:44 +00:00
Sam Minnee
297b00606a MINOR: recache tables if cache is empty (from r103606)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:59:16 +00:00
Sam Minnee
2662896ed2 BUGFIX: ModelAsController test failed for projects which do not support nested urls. This fix stores the original configuration and enables 'nested-urls' at the beginning of the tests and reset the state in tearDown. (from r103591)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112151 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:58:29 +00:00
Sam Minnee
712680a5e8 BUGFIX #5362: Fixed duplicate removal on DataObject:get() with join argument for all databases. (from r103588)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112150 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:58:10 +00:00
Sam Minnee
1e925a9e91 BUGFIX Choosing i18n::default_locale() in Member->populateDefaults() instead of "current locale". This fixes a bug where a new member created through admin/security automatically "inherits" the current locale settings of the admin creating it. (from r103582)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112149 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:57:49 +00:00
Sam Minnee
60cd41a03b ENHANCEMENT Added i18n::set_default_locale() to set standard locale (which is different from "current locale" retrieved through i18n::get_locale()) (from r103581)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112148 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:57:31 +00:00
Sam Minnee
35378e577e BUGFIX CSSContentParser now reports better errors by using simplexml_load_string() instead of SimpleXMLElement directly (from r103552)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112147 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:57:07 +00:00
Sam Minnee
077a119cfb MINOR Database quoting in TreeDropdownField (fixes #5484) (from r103515)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:56:48 +00:00
Sam Minnee
16f83851db ENHANCEMENT: make the getTree ajax call more generic so it get local from its containing form, rather than hard-coded "Form_EditForm_Locale" cos the field is not only used in "EditForm" (from r103466)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112145 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:56:05 +00:00
Sam Minnee
752869e23b BUGFIX Renamed Nested URLs are automatically redirected to their new location with 301 HTTP status code in ModelAsController/ContentController (fixes #5393, thanks cbarberis) (from r103461)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:55:34 +00:00
Sam Minnee
da671c628d BUGFIX Fixed CurrencyField->jsValidation() regex escaping (fixes #5462, thanks mobiusnz) (from r103451)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112143 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:53:52 +00:00
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
a2f6487fa3 BUGFIX DateField with setConfig('dmyfields') now validates TRUE for empty values (fixes #5458) (from r103450)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112140 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:52:36 +00:00
Sam Minnee
5ba7760f35 MINOR: Compiled duplicate tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:48:33 +00:00
Sam Minnee
c1f38aa66c ENHNANCEMENT: Move cuke/ to salad/ (from r103376)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112136 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:45:43 +00:00
Sam Minnee
a45a48353e MINOR Reverted accidental commit of date_default_timezone_set() to Pacific/Auckland (see r89164) (from r103345)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112135 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:44:52 +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
eb43fb14ef MINOR Returning ValidationResult from Member->onBeforeWrite() to ensure the ValidationException is compatible with MemberTableField (related to r103336) (from r103337)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112133 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:42:49 +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
49496e5c4b BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme. (from r103255)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:40:05 +00:00
Sam Minnee
9f61d51635 REVERT: checked in not-yet-ready code by mistake, reverting (from r103251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112129 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:39:36 +00:00
Sam Minnee
51375f7cc6 ENHANCEMENT: added tests for checking the change password functionality, including the resulting redirection (from #5420) (from r103250)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112128 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:39:04 +00:00
Sam Minnee
5cb4090145 BUGFIX: r101093 broke casting of values from the failover object. Add lookup to the failover for casting info, and add test (from r103240)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:38:23 +00:00
Sam Minnee
5cabd56ac6 ENHANCEMENT: allow ChangePasswordForm to redirect to BackURL (from #5420) (from r103229)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112126 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:36:39 +00:00
Sam Minnee
86fa92248a BUGFIX: made the invalid password message translatable; disallow new blank password (as it makes it impossible to login); Member::checkPassword now returns ValidationResult - handle that properly (#5420, patch submitted by walec51)
MINOR: typo (from r103226)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112125 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:36:13 +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
1a67919d33 BUGFIX: default sort column now quoted (from r103183)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112122 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:34:15 +00:00
Sam Minnee
650a9f62c0 BUGFIX: default sort column now quoted (from r103182)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112121 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:33:16 +00:00
Sam Minnee
6387f735e3 BUGFIX Only replace double slashes in SS_HTTPRequest->__construct() for relative- its a failsafe against wrongly formatted URLs like 'admin//assets' instead of 'admin/assets', but breaks absolute URLs with 'http://' prefix (from r103099)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112120 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:31:53 +00:00
Sam Minnee
4db5dd3e47 MINOR: fixed the error message on class conflict (#5439, patch submitted by rorschach) (from r103093)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:31:22 +00:00
Sam Minnee
eef3ff8021 BUGFIX: disallow numeric actions - numeric array indexes are incorrectly picked up as allowed actions (#5331) (from r103092)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112118 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:30:54 +00:00
Sam Minnee
6f30671604 MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112073 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:49:21 +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
961d4ce298 BUGFIX: added optional separator for http_build_query in HTTP:setGetVar(). this fixes sorting columns in ModelAdmin (ticket #5325). (from r103012)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:48:24 +00:00
Sam Minnee
83f117f58c MINOR Using canView() instead of deprecated can('view') in ContentController (from r102909)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112070 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:46:33 +00:00
Sam Minnee
64a561f96c BUGFIX Fixing RquestHandler->checkAccessAction() on PHP 5.2 - ReflectionMethod->class returns inconsisent results in older PHP versions. (see r102003) (from r102730)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112069 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:46:02 +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
19f4c1ef89 BUGFIX #5320 ManyManyComplexTableField::getQuery() now uses T-SQL compatible syntax CASE WHEN instead of IF THEN which works in multiple databases as well (from r102436)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112066 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:42:01 +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
10009d0c10 BUGFIX: SSViewer now allows cli to do a flush on non-dev environments (from r102300)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:40:09 +00:00
Sam Minnee
50c5887aec BUGFIX: exchanged MySQL CONCAT function with ANSI compliant operator (from r102237)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112063 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:37:24 +00:00
Sam Minnee
16277e5299 BUGFIX: fallback to the standard authenticator before throwing user_error as in some cases auth method is not passed back to the login form (from r102156)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:36:12 +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
6c3bcc356d MINOR Fixed spelling mistake in ConfigureFromEnv class documentation (from r102045)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112059 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 01:28:54 +00:00