Commit Graph

2571 Commits

Author SHA1 Message Date
Sean Harvey
60c5570bf8 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 02:19:50 +00:00
Sean Harvey
b8ce07f459 BUGFIX Fixed SQL generation in ContentController::PageComments() - '`' (backticks) are not valid in queries on sapphire/trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 02:08:18 +00:00
Will Rossiter
5448a29835 FEATURE: added ability to display comments even when comments have been disabled. #2081
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 01:56:21 +00:00
Ingo Schommer
afbac71d31 MINOR Formatting in MoneyField, added @todo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77791 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 01:08:47 +00:00
Ingo Schommer
2a58703ecf BUGFIX Money->setValue() was not working when loading $value and $record parameters, and only $record had a
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 01:08:27 +00:00
Sam Minnee
d8b46e5501 ENHANCEMENT: Allow altering of DataObject:$api_access by decorators.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77787 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 00:52:54 +00:00
Ingo Schommer
b478c8be34 FEATURE Added MoneyField as a form field to edit Money values
ENHANCEMENT Using MoneyField in Money->scaffoldFormField()
BUGFIX Fixed Money->setValue() to respect $value parameter over $record to avoid wrongly updated values from stale $record values instead of new $value

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77772 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 22:21:02 +00:00
Sean Harvey
75ba6a1ab9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 06:59:21 +00:00
Ingo Schommer
4d55f1e5d7 BUGFIX Fixed Money->Nice() to provide symbol and currency shortname based on Money->getCurrency()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77754 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 06:03:06 +00:00
Tom Rix
e1f54bc394 MINOR syntax error in TestRunner.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77706 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 02:31:35 +00:00
Ingo Schommer
9c10166381 BUGFIX Failing in TestRunner->init() when PHPUnit is not present, not only in specific method invocations. Previously it was missing checks on only() method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77704 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 02:29:05 +00:00
Ingo Schommer
86388328a1 BUGFIX Fixed SQL syntax error in MATCH AGAINST clause in FulltextFilter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-24 21:27:48 +00:00
Saophalkun Ponlu
ce6402f8d0 ENHANCEMENT: use image file name (without file path and extension) for alt attribute when title is not provided
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-24 12:16:17 +00:00
Ingo Schommer
9f7bbc57d0 BUGFIX Inspecting the change status of all CompositeDBFields when invoking DataObject->getChangedFields(), as their value setting is not performed through DataObject->setField(), it doesn't trigger the built-in change detection.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77667 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-23 05:32:16 +00:00
Sam Minnee
cc93959d7f ENHANCEMENT: Updated Versioned::compareVersions() to use DataDifferencer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77660 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-23 03:29:33 +00:00
Sam Minnee
82f803601a API CHANGE: Added DataDifferencer, for comparing data objects (merged from r77658)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-23 03:28:18 +00:00
Sean Harvey
bb5eff8bed BUGFIX Ensure that any white space is stripped in FieldSet::dataFieldByName() and FieldSet::fieldByName()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 10:18:15 +00:00
Sean Harvey
c4071d3521 MINOR Code formatting fix in FieldSet
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77649 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 10:11:03 +00:00
Ingo Schommer
265b4184f7 BUGFIX Fixed DataObject->write() for CompositeDBFields - wasn't calling setValue() on those fields, which meant that CompositeDBFields like Money were overwriting the values set in DataObject::$record (e.g. "MoneyCurrency" for a "Money" field) with empty values through CompositeDBField->addToManipulation(), as the dbfield itself doesn't have any values.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 09:07:08 +00:00
Sean Harvey
ee072565ec API CHANGE Removed @deprecated method Text::LimitWordCountPlainText(): Please use Text::LimitWordCount() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77635 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 04:54:51 +00:00
Sean Harvey
cd2a6e0608 MINOR Added message to the top of DevelopmentAdmin::build() in red (if run from the web) to warn the user of deprecation, and that they should use dev/build instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77634 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 04:48:05 +00:00
Ingo Schommer
825362bf00 MINOR Added MoneyTest->testLoadFromFixture()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77633 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 04:45:07 +00:00
Sean Harvey
cdbc501c93 MINOR Escaped characters in DebugView::writeHeader() debug page title using htmlentities()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 04:29:25 +00:00
Sam Minnee
9385db7728 Updated externals, to bring Zend into our repository and use relative externals.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77619 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 04:19:44 +00:00
Will Rossiter
cf35533a78 EHANCHMENT: update the regular expression to disregard any underscores directly before a capital letter, as well as using the PCRE functions and adding a small test. PATCH: #4081
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 03:49:15 +00:00
Sean Harvey
0923b5825e MINOR Removed references to ManifestBuilder::compileManifest() that has since been removed (bgribaudo)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 03:31:26 +00:00
Will Rossiter
9384936c51 MINOR: updated legacy form comment. PATCH #3769
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77599 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 02:49:30 +00:00
Julian Seidenberg
8afb2c131c BUGFIX: corrected datetime output when using 12-hour time values returned from SQLServer databases
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 02:00:50 +00:00
Will Rossiter
1640844189 MINOR: changed MetaDescription to text field as the optiomal SEO guides Description to be up to 744 characters. MINOR: changed MetaKeywords textbox to 2 rows high to provide a visual cue for amount of keywords to use.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 00:53:53 +00:00
Sean Harvey
5886d4578b BUGFIX Fixed undefined variables in MySQLDatabase::indexList()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77581 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 23:17:25 +00:00
Sam Minnee
b5a0b94b96 MINOR: Updated obsolete PDODatabase not to have a parse error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 09:14:15 +00:00
Sam Minnee
86c7c2a3bd BUGFIX: Fixed engine selection option default, so that it works on windows.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 08:42:18 +00:00
Sam Minnee
3e205b632f BUGFIX: Added Versioned::on_db_reset() so that Versioned tests would run properly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 08:08:01 +00:00
Sam Minnee
9effc74de3 API CHANGE: Allow passing of temporary option to Database::createTable()
BUGFIX: Made Versioned's archive table functions (show deleted pages and show site at a particular date) db agnostic.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 05:08:11 +00:00
Ingo Schommer
90ebeaf741 API CHANGE Automatically using DBField->Nice() in tabular view of TableListFields (and subclasses like ComplexTableField) instead of using the scalar value. This means for example values casted as Boolean will render as "Yes"/"No" rather than "1"/"0"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77549 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 04:48:24 +00:00
Ingo Schommer
a2a507f73c BUGFIX Fixed Money->writeToManipulation() to correctly overwrite with NULL values
ENHANCEMENT Added Money->NiceWithName()
ENHANCEMENT Changed Money->NiceWithShortname() to use Zend_Currency options
BUGFIX Setting isChanged flag on Money individual setters
MINOR Added Money->__toString()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 04:46:58 +00:00
Sean Harvey
7cb259f051 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77454 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 00:14:47 +00:00
Ingo Schommer
a7e93c3099 BUGFIX Moved set_include_path() directive for including sapphire/thirdparty from sapphire/_config.php to Core class - needs to be loaded before other _config.php files are parsed, to enable e.g. usage of the Money class in a static context
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77435 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 23:19:08 +00:00
Sean Harvey
310a85cd9e BUGFIX Fixed Convert::json2array() from dying if Convert::json2obj() returns false
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77428 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 22:52:33 +00:00
Sean Harvey
2a66b5a8e1 API CHANGE Removed @deprecated 2.3 method FieldSet::insertBeforeRecursive(): Please use FieldSet::insertBefore() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:53:30 +00:00
Sean Harvey
c83770f403 API CHANGE Removed @deprecated 2.3 function Email::setFormat() - this was not used anywhere
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:52:32 +00:00
Sean Harvey
452c3294b0 API CHANGE Removed @deprecated 2.3 method Form::resetData(): Please use Form::resetField() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:45:50 +00:00
Sean Harvey
200c41b8b7 API CHANGE Removed @deprecated 2.3 HiddenFieldHolder.ss file to go along with the removal of the class in r77397
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:42:30 +00:00
Sean Harvey
1b84cdd7e4 API CHANGE Removed @deprecated 2.3 class HiddenFieldGroup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:41:07 +00:00
Sean Harvey
55bcfbe1a1 API CHANGE Removed @deprecated TypeDropdown class: Please use a DropdownField instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:37:19 +00:00
Sean Harvey
cd0c5db141 API CHANGE Removed @deprecated SearchForm::showInSearchTurnOn: Please ensure that pages which should be searched have ShowInSearch field checked in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:30:02 +00:00
Sean Harvey
a9370a26f9 API CHANGE Removed @deprecated 2.3 class AjaxFormAction - this doesn't do anything special. Please create your own ajax on FormAction instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77393 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:22:18 +00:00
Sean Harvey
2b3889b640 API CHANGE Removed @deprecated 2.3 function Debug::sendLiveErrorsTo(): Please use Debug::send_errors_to() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:19:14 +00:00
Sean Harvey
6369bb80de API CHANGE Removed @deprecated 2.3 GhostPage and SiteTree::MultipleParents() which used it
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77383 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 06:45:32 +00:00
Sean Harvey
071960d196 API CHANGE Removed @deprecated 2.3 ReportField class and JS - this is a relic of DataReport which is now gone
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 06:33:26 +00:00