Sam Minnee
0bd9bc4ff8
Merged changes from 2.2.2-assets - everything except the asset refactoring
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:51:33 +00:00
Sam Minnee
b5001bc906
Allow object-methods to be used as columns in TableListField
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60448 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 00:12:29 +00:00
Sam Minnee
668dc7c6d2
Fixed js error when defaultAction isn't set
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60446 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 00:12:10 +00:00
Sam Minnee
8bf5c3781e
Reverted Hierarchy::extraDBFields() because it interfered with normal generation of the site hierarchy. Note that children(), stageChildren(), and liveChildren() cannot be simply labelled as relations because they are methods with a different semantic meaning. I recommend the use of something similar to to enable access to information beyond relations via the data formatters
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60442 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:51:45 +00:00
Hayden Smith
62d90957eb
Refactored [47041] to [47043]: Moved to project-specific PhoneNumberField.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:37:25 +00:00
Hayden Smith
e87efed15e
Refactored [47040]: Functionality moved to project-specific Member subclass.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:34:11 +00:00
Hayden Smith
1220f6d86d
Merged [47039]: Introduces custom actions to TableListField and ComplexTableField. By default, the show, edit and delete actions are included.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60433 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:24:54 +00:00
Sam Minnee
4258361337
API Change: Turned Requirements::clear_combined_files() into Requirements::delete_combined_files() and Requirements::clear_combined_files()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60431 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:18:56 +00:00
Sam Minnee
72b9d12aae
Fix test runner to show errors as well as assertion failures
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60428 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:17:32 +00:00
Sam Minnee
12a62b9f62
Updated SecurityTest to use new FunctionalTest system consistently
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:04:25 +00:00
Sam Minnee
300e77bda9
Added FunctionalTest->autoFollowRedirection, so that redirection following can be disabled on a test by test basis
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60426 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:04:01 +00:00
Sam Minnee
a94c7c8a2f
Improved error checking in TestSession
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60425 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:02:22 +00:00
Ingo Schommer
655802177c
BUGFIX Added Requirements::path_for_file() to support external URLs in required paths (incl. unit test)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 07:22:50 +00:00
Ingo Schommer
15b11e3f13
BUGFIX Fixed RequirementsTest combine_files() testing to accept new javascript inclusion format with added modified flags
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60413 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:28:29 +00:00
Ingo Schommer
b795186d0a
BUGFIX Fixed JSON.php include path in Convert.php
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60412 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:27:53 +00:00
Sam Minnee
970cba1b5d
Fixed call to badly named static method
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60411 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:11:33 +00:00
Sam Minnee
9b7bf6a187
BUGFIX: Fixed test runner's handling of errors
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60410 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:10:59 +00:00
Ingo Schommer
4c4c20919f
MINOR Re-enabled DataObjectDecoratorTest
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60407 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:01:16 +00:00
Ingo Schommer
c9b09e6c96
MINOR Moved sapphire/misc* to sapphire/thirdparty and sapphire/integration
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60406 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:58:34 +00:00
Ingo Schommer
8cc53c39ec
API CHANGE Removed merged USZipCode field - should be custom code until we figure out proper localization
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60405 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:56:32 +00:00
Sam Minnee
69100325ca
BUGFIX: Further fixes to Director::test()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60404 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:55:31 +00:00
Ingo Schommer
34479223fa
MINOR Moved ScaffoldComplexTableField to separate file
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:41:00 +00:00
Ingo Schommer
4904969c60
MINOR Removed DataObject->mapRelationshipObjects() - incomplete functionality
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:37:56 +00:00
Ingo Schommer
d1561b82aa
MINOR Moved BulkLoader and CsvBulkLoader from sapphire/tools to sapphire/dev
...
MINOR Removed sapphire/tools
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:36:54 +00:00
Sam Minnee
9cb17cd5d1
BUGFIX: Changes to DataObject::get_one() caching to try and fix segfaults
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:31:13 +00:00
Ingo Schommer
f9a1118b64
FEATURE Added configurable Requirements::$write_js_to_body for performance improvements (turned off by default)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:29:41 +00:00
Sam Minnee
8536a47b7c
Update SecurityTest to use the FunctionalTest base-class
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:27:18 +00:00
Sam Minnee
3b1a6293a2
BUGFIX: Fixed superglobal masquerading in Director::test()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60393 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:26:51 +00:00
Sam Minnee
eb9e66808c
API CHANGE: Renamed static Member::autologinhash() to static Member::member_from_autloginhash() to be more in line with naming convnetions, and not conflict with Member.AutoLoginHash in the database
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:18:18 +00:00
Sam Minnee
c812ca5f91
Improved robustness of MemberTest
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:17:37 +00:00
Sam Minnee
028cb281ce
Improved Debug::backtrace() output
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:16:51 +00:00
Sam Minnee
356a0a706b
BUGFIX: Fixed Yaml fixtures for SapphireTest
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:16:08 +00:00
Hayden Smith
70bd588ba5
Blocked [47034] to [47038].
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:04:05 +00:00
Hayden Smith
70434ecbc2
Merged [47033]: TableListField::performReadonlyTransformation now sets show permission.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60383 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:00:27 +00:00
Ingo Schommer
93b3d41701
BUGFIX Re-added additional GroupTest tests (merge error from branches/roa)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:59:14 +00:00
Ingo Schommer
22023325cb
BUGFIX Re-added test classes to DataObjectSet (lost during mergeback)
...
BUGFIX Removed duplicate GroupTest.php files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60378 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:51:58 +00:00
Sam Minnee
3574d3c3b6
Added argument checking to Controller::handleRequest()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60377 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:48:45 +00:00
Sam Minnee
5988ca478f
API CHANGE: Allow the definition of SS_ERROR_LOG in _ss_environment.php to set up Debug::log_errors_to().
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60376 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:41:54 +00:00
Sam Minnee
75aa4167bf
Set [REQUEST_URI] in cli-script for better error reporting
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60375 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:40:37 +00:00
Ingo Schommer
3d28c5a23c
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60371 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:13:06 +00:00
Ingo Schommer
1077cbf08f
MINOR Removed debug code from Member.php
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:05:48 +00:00
Sam Minnee
db1e79c3b1
FEATURE: Improved debugging view on CLI interface, by having a separate DebugView subclass that takes care of error output for this situation.
...
API CHANGE: Added Debug::log_errors_to(), to log errors to a file.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60368 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:02:32 +00:00
Ingo Schommer
010c91af0a
MINOR removed obsolete code from DataObject.php
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:01:00 +00:00
Sam Minnee
cc496ad4f7
Fixed URL handling for /dev after merge from branches/roa to trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60362 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:56:09 +00:00
Sam Minnee
1759038d58
Fixed sake to pass cli-script error levels through
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:45:55 +00:00
Ingo Schommer
46417f5d8a
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:42:59 +00:00
Ingo Schommer
ac527ee8ed
(blocked bidirectional merge from trunk into branches/roa)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60353 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:39:58 +00:00
Ingo Schommer
4735f91ab8
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:39:14 +00:00
Hayden Smith
dff25fc11c
Blocked [47029].
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60341 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:19:48 +00:00
Hayden Smith
f9de104d56
Blocked [47027].
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60339 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:16:34 +00:00