Commit Graph

15805 Commits

Author SHA1 Message Date
Ingo Schommer
55f12939bb Defined $schemaDataType constant, added to FormField subclasses 2016-03-30 23:00:00 +13:00
Ingo Schommer
3862a7a0a7 Moved FormFieldSchemaTrait into FormField
The RFC requires a FormField implementation to override $schemaDataType,
but its defined on the trait - which can't be redefined by a field subclass.

In the end, the trait was never designed to be reuseable on classes other than FormField.
We need to admit that architecturally, we'll have to add all that API weight to the base FormField
class because of the way forms are structured in SilverStripe (mainly due to a missing layer
of indirection in getCMSFields implementations).

Also implemented the $schemaDataType on fields where its known.

See https://github.com/silverstripe/silverstripe-framework/issues/4938
See http://php.net/manual/en/language.oop5.traits.php#language.oop5.traits.properties.example
2016-03-28 21:54:42 +13:00
Ingo Schommer
c3a8159e80 Default to schema response part in LeftAndMain->schema()
More of a standard API approach to return data by default, and make customisation
via HTTP headers an optional mode.
2016-03-28 21:54:42 +13:00
Ingo Schommer
adbcddee80 Only iterate through dataFields() in FormSchema
Temporary measure until we implement nested fields
2016-03-28 21:54:27 +13:00
Ingo Schommer
8ae2894890 Fix form schema ID getter
Also moved keys of higher importance to start of array,
easier to review this way
2016-03-28 21:54:24 +13:00
David Craig
5d88950735 Adds schemaDataType to FormFieldSchema 2016-03-28 21:14:06 +13:00
Daniel Hensby
1bcd755120 Merge pull request #5229 from madmatt/pulls/fix-gridfield-annotations
MINOR: Fix PHPUnit @covers assertions for GridFieldTest
2016-03-26 21:15:13 +00:00
madmatt
c972692313 MINOR: Fix PHPUnit @covers assertions for GridFieldTest
This resolves issues when PHPUnit is run strictly, where it exits when
it hits an @covers annotation that references a method that doesn't exist
2016-03-26 11:55:01 +13:00
Hamish Friedlander
1e53f29f33 Merge pull request #5219 from open-sausages/pulls/4.0/optional-owned-by
API Improvements to ownership api
2016-03-24 10:08:40 +13:00
Damian Mooyman
c6c71fa3be Merge pull request #5221 from christopherdarling/patch-1
remove $CleartextPassword from ChangePasswordEmail.ss
2016-03-24 10:00:47 +13:00
Christopher Darling
ceccd9551c remove $CleartextPassword and update wording on
ChangePasswordEmail.ss

4.x version of https://github.com/silverstripe/silverstripe-framework/pull/5194
2016-03-23 07:50:36 +00:00
Damian Mooyman
094745ec0f API Formally support custom ownership relations
API 'owned_by' is no longer mandatory for relations backed by normal db relations
API Extension setOwner/clearOwner is now nested
2016-03-23 14:49:34 +13:00
Damian Mooyman
633eb0163e Merge pull request #4551 from sminnee/php7-support
PHP7 support
2016-03-23 09:21:51 +13:00
Sam Minnee
f5af0c85ba FIX: Don’t use SplFixedArray in PHP 7.
PHP 7 seems to suffer a segfault when using SplFixedArray. Since LRU is
deprecated anyway, I’m not too fussed about getting to the bottom of
this issue, however, if it turns out that SplFixedArray is corrected in
PHP 7.0.0 stable or a future patch release, we could update this check.
2016-03-22 18:09:38 +13:00
Sam Minnee
aeccb8b8e0 API: Move DBField subclasses into SilverStripe\Model\FieldType namespace
API: Deprecate SS_Datetime.

The DBField subclasses are have all been renamed to start with “DB” and
be in the SilverStripe\Model\FieldType namespace. To keep DataObject
definitions concise, the original short variations of their names are
preserved as service definitions. Most of the field generation code
doesn’t need to change, but where field classes are referenced directly,
changes will be needed.

SS_Datetime, which is commonly referenced outside the model system
itself, has been preserved as a subclass of DBDatetime. This has been
marked as deprecated and can be removed in SilverStripe 5.

A few places that referred to $db and $casting values weren’t using
the Injector to instantiate the relevant classes. This meant that the
remapping we have created as part of moving classes into a namespace
didn’t work.
2016-03-22 18:09:30 +13:00
Sam Minnee
262f487053 MINOR: Avoid access-changing subclass in test.
Using a subclass to change the visibility of protected items didn’t
seem necessary in this case, if we add a reasonably logical getter
method.
2016-03-22 17:39:09 +13:00
Sam Minnee
52ca089d0b NEW: Ensure php7 builds pass.
SilverStripe 4 should work in php7, so we shouldn't accept its failure.
2016-03-22 17:39:09 +13:00
Sam Minnee
8518fc1425 FIX: Clarify PHP7-incompatible call styles.
These call signatures have changed their meaning in PHP7. The new
disambiguated form should work in all versions.
2016-03-22 17:39:09 +13:00
Sam Minnee
083799ec03 FIX: Minimal data-model changes to support PHP7.
The tidiest fix for this will be to update the namespace/naming of all
field types to follow this pattern. I’ve broken out the minimum
necessary to support PHP7 as its own commit, in case anyone needs to
backport that (e.g. if someone wanted to patch a SS 3 system to get
PHP7 support).

Rather than introduce a new API for fieldtype namespace simplification,
I’ve just used Injector. We may come up with a new configuration tool
that is better, but this has the advantage of existing now, and as such
I think is a good first step.
2016-03-22 17:39:08 +13:00
Sam Minnee
12a83d70ae FIX: Removed PHP4 syntax from Diff.php
Like SimpleTest, we should probably replace this for a new library,
but for now this will help us achieve PHP7 support.
2016-03-22 17:39:08 +13:00
Sam Minnee
0dcccfafb3 MINOR: Whitespace fixes in SimpleTest. 2016-03-22 17:39:08 +13:00
Sam Minnee
680b19a1da FIX: Correct PHP4-style constructors in SimpleTest.
Note that the best solution to this will be to remove the use of
SimpleTest entirely. This is quick fix is intended to help us get PHP7
tests running without needing to cross that bridge.
2016-03-22 17:39:08 +13:00
Daniel Hensby
03a3244d12 Merge pull request #5173 from tractorcow/pulls/4.0/remove-duplicate
BUG Remove duplicate extension hook
2016-03-21 09:35:46 +00:00
Ingo Schommer
3573236310 Merge pull request #5213 from open-sausages/pulls/4.0/fix-tinymce-shortcodes
API and BUG fix; Update ssbuttons tinymce plugin for image shortcode parsing
2016-03-21 14:33:37 +13:00
Damian Mooyman
7769f03ccc BUG Remove duplicate extension hook
Fixes #5170
Reverts #3355
2016-03-21 14:03:41 +13:00
Damian Mooyman
2d56ea278a API Move ss buttons plugin out of thirdparty
BUG Fix incorrect parsing of shortcode properties
2016-03-21 13:51:33 +13:00
Damian Mooyman
5d3b896297 Merge pull request #5180 from dhensby/pulls/4/npm-update
Updating required node version
2016-03-21 10:46:56 +13:00
Damian Mooyman
214a1e967d Merge pull request #5174 from open-sausages/pulls/4.0/tinymce-image-shortcodes
Tinymce image shortcodes
2016-03-21 10:29:03 +13:00
Ingo Schommer
8ae794ee99 API TinyMCE Image shortcodes 2016-03-21 09:23:40 +13:00
Hamish Friedlander
98eea60ec9 Merge pull request #5157 from open-sausages/features/triggered-publishing
API Owned objects are now automatically published
2016-03-17 14:36:03 +13:00
Damian Mooyman
0848aca462 API Massive refactor of Versioned
API Implemented recursive versioned actions (publish, etc)
API Un-deprecate delete batch action
API Changed Versioned getters and setters for stages
BUG Inject query parameters during DataObject construction to prevent incorrect lazy loading
2016-03-17 13:43:53 +13:00
Daniel Hensby
ed267d03bd Updating required node version 2016-03-16 21:54:07 +00:00
Daniel Hensby
a7a23afe38 Merge pull request #5163 from mikenz/patch-5
Build dist assets and added console.warn
2016-03-14 16:38:28 +00:00
Damian Mooyman
6d8c625b31 Merge pull request #5161 from open-sausages/nav-pretty
New styles for main nav
2016-03-14 12:02:31 +13:00
Paul Clarke
ae31619695 New styles for main nav 2016-03-14 10:18:32 +13:00
Daniel Hensby
37f11f3445 Merge pull request #5264 from mikenz/patch-6 2016-03-11 00:35:34 +00:00
Mike Cochrane
3673a5e141 FIX Inserting a 'Download a file' without selecting an image
In the html editor, when inserting a 'Download a file' link without selecting a file to link to, no link should be inserted. Currently is inserting a link to an undefined file id: [file_link,id=undefined]
2016-03-11 00:35:13 +00:00
Daniel Hensby
99d6688435 Merge pull request #5166 from tractorcow/pulls/4.0/fix-cleanup-db
BUG Fix CleanupTestDatabaseTask
2016-03-10 21:40:17 +00:00
Damian Mooyman
e2a377e21e BUG Fix CleanupTestDatabaseTask 2016-03-10 10:17:36 +13:00
Mike Cochrane
0b81bbef22 FIX attempt to access https iframe from http interface 2016-03-09 21:36:39 +13:00
Mike Cochrane
a3ee9ece90 FIX avoid javascript error when preview is https
When the admin interface is http but the preview is https, javascript isn't able to read the contentDocument of the secure preview iframe. This currently results in a javascript error. Patch wraps try/catches around the two instances,
2016-03-09 21:19:26 +13:00
Damian Mooyman
02a87796ff Merge pull request #5133 from mikenz/patch-2
Fix i18n.sprintf() parameters being off by one
2016-03-09 13:12:51 +13:00
Damian Mooyman
26cd1a2d5f Merge pull request #5159 from robbieaverill/patch-2
Updated 4.0.0 changelog
2016-03-09 10:22:02 +13:00
Damian Mooyman
3dada00905 Cleanup trailing whitespace 2016-03-09 10:20:31 +13:00
Robbie Averill
9379914038 Updated 4.0.0 changelog
Backtick mania
2016-03-09 09:37:06 +13:00
Damian Mooyman
016ea2efb1 Merge pull request #5155 from mikenz/patch-3
Don't delete all assets when uploading a file in the root
2016-03-08 13:35:00 +13:00
Mike Cochrane
e03115198f Don't delete all assets when uploading a file in the root
Catch "." dirnames in more places. truncateDirectory('.') will delete every asset. That's an undesirable thing.
findVariants() wouldn't return any variants if the dirname in "."
2016-03-08 13:12:07 +13:00
Damian Mooyman
7b2124004a Merge pull request #5149 from kakauandme/patch-1
BUG Fix extra semi-colon and double quotes
2016-03-07 20:16:30 +13:00
Kirill Kliavin
1607546b68 Extra semi-colon and double quotes
Displays extra characters
2016-03-07 17:59:18 +11:00
Damian Mooyman
6d88caa9b3 Merge pull request #5132 from open-sausages/features/form-schema
API Form schema
2016-03-07 14:08:36 +13:00