tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
13,568 Commits 31 Branches 527 Tags 162 MiB
7bf4d2e95e
Commit Graph

2118 Commits

Author SHA1 Message Date
Ingo Schommer
998b8e048c Merge pull request #634 from silverstripe-rebelalliance/3.0_7603 
BUGFIX: open ticket 7603 fixing search filtering - thought I should initialise $dataListClone
 2012-07-11 06:59:39 -07:00
Jeremy Bridson
e096c297b8 BUGFIX: open ticket 7603 fixing search filtering - thought I should initialise $dataListClone 2012-07-11 09:19:50 +12:00
Ingo Schommer
0ae20a13f8 Merge pull request #630 from silverstripe-rebelalliance/open/6875 
BUG: open/6875 removing DataGrid filter fields from track changes
 2012-07-10 02:50:00 -07:00
Will Rossiter
6b611c6825 Merge pull request #572 from burnbright/datefield-fix 
BUGFIX: DateField javascript fails when it is included in a GroupField
 2012-07-08 21:50:48 -07:00
Ingo Schommer
64357a4522 Merge branch '3.0' 
Conflicts:
	admin/css/screen.css
	admin/scss/_forms.scss
	docs/en/changelogs/3.0.0.md
 2012-07-05 18:01:09 +02:00
jakr
20696958df FIX: Ticket #7592 GridFieldDataColumns: Wrong documentation for getFieldCasting Moved documentation to the appropriate function, added note about the two parameter callback function. 2012-07-04 18:08:24 +02:00
Andrew Short
eb733dee60 NEW Add set config method to GridField. 2012-07-04 13:13:23 +10:00
Kirk Mayo
9d88169f3e BUG: open/6875 removing DataGrid filter fields from track changes 2012-07-04 10:27:42 +12:00
Jeremy Shipman
dbc1edef87 Merge branch 'master' of github.com:silverstripe/sapphire into datefield-fix 2012-06-30 19:13:03 +12:00
Ingo Schommer
aa8dfd127c FileField->getUpload() and setUpload() 2012-06-28 11:42:27 +02:00
Ingo Schommer
cb145a0094 "dmyplaceholders" setting for DateFields 2012-06-27 10:12:42 +02:00
Ingo Schommer
0dfc82342a Merge pull request #574 from mightycoco/master 
Improving oEmbed insertion of direct image urls
 2012-06-26 15:43:41 -07:00
Ingo Schommer
218037b8cf Add .dropdown class to CountryDropdownField to make it use chosen.js 2012-06-26 17:56:07 +02:00
Ingo Schommer
a9fa281723 Form field docs update (fixes #7521) 2012-06-26 15:03:11 +02:00
Naomi Guyer
d935a74e31 ENHANCEMENT: Modify GridFieldLevelup to be more reusable 2012-06-26 13:34:49 +02:00
mightycoco
e582935582 BUGFIX insertion of images (trac #7438) 
Allow insertion of images via oEmbed dialog using a direct url
 2012-06-25 17:19:15 +02:00
Jeremy Shipman
606d86a926 BUGFIX: DateField javascript fails when it is included in a GroupField 2012-06-25 20:32:53 +12:00
Naomi Guyer
e51bf760e9 BUGFIX: Insert link styling broken, and inconsistent with Insert media (fixes #7528) 2012-06-25 15:31:39 +12:00
Naomi Guyer
5713a37a32 BUGFIX: Alignment of http label in insert media 2012-06-22 18:11:00 +12:00
Naomi Guyer
f01c1640c7 BUGFIX: Alignment of http label in insert media 2012-06-22 18:04:13 +12:00
Sam Minnee
4aa4cd2c28 Merge branch '3.0' 
Conflicts:
	admin/scss/ie7.scss
 2012-06-22 17:20:07 +12:00
Hamish Friedlander
01062c70a1 ENHANCEMENT: Add back CountryDropdownField 
We removed this because it depended on GeoIP, which was weird, and had its own dependancies.
But Zend_Locale is included in core, and can give us all the data we need for CountryDropdownField
 2012-06-22 09:51:33 +12:00
Hamish Friedlander
65030906ad BUGFIX: Add validation to fix open.silverstripe.org ticket #7494 
When adding media via the HtmlEditorField dialog, the value of the URL field wasnt being validated. Youd get different errors depending on if the field was empty
or if it had text, but it didnt look like an absolute URL to HtmlEditorField#viewfile.

This adds some javascript validation to make the text field look like a URL field
 2012-06-21 14:19:41 +12:00
Ingo Schommer
6af3b076be MINOR Fixed phpdocs 2012-06-20 23:59:57 +02:00
Ingo Schommer
3a7128d00c MINOR Fixed phpdocs 2012-06-20 23:59:16 +02:00
unclecheese
e2c1deb4f7 MINOR Chainable Form->loadDataFrom() 2012-06-20 17:01:16 +02:00
Ingo Schommer
5fa1633fe5 MINOR Saving UploadField detail form correctly when nested in GridField 2012-06-15 17:50:18 +02:00
Ingo Schommer
eff93bdd5b ENHANCEMENT Disable UploadField when handling unsaved relations (fixes #7187) 2012-06-15 17:44:34 +02:00
Ingo Schommer
02332da7fb MINOR GridField compat with ViewableData records (fixes #7479) 
Only use relField() when it exists (usually on DataObject),
otherwise fall back to method or value returns
(same as original GridFieldDataColumns behaviour).
 2012-06-15 13:33:34 +02:00
Sean Harvey
b04c199064 MINOR Fixing additional cases where DataList needs to be returned correctly when filtering 2012-06-15 16:09:40 +12:00
Sean Harvey
538bcdc74d BUGFIX Ensure that the DataList is being used correctly when applying filters in HtmlEditorField and Hierarchy 2012-06-15 15:49:22 +12:00
Sam Minnée
a93dd9459e Merge pull request #496 from sminnee/dataquery-aggregate 
Dataquery aggregate
 2012-06-14 17:20:35 -07:00
Ingo Schommer
6c1f7997a4 ENHANCEMENT HTML titles in TreeDropdownField 
HTML in tree nodes is already used to render page icons via SiteTree->TreeTitle.
In order to select the initial value correctly via HTML5 data attributes,
we need to encode any HTML values.
 2012-06-13 16:04:14 +02:00
Ingo Schommer
db076c0f02 MINOR Using new setDescription() styling in HtmlEditorField 2012-06-13 13:21:41 +02:00
Andrew Short
9e4b526213 MINOR: Include the title attribute on tree and readonly fields. 2012-06-13 13:19:16 +02:00
Ingo Schommer
666fa7a26e Merge branch 'togglecompositefield' of https://github.com/ajshort/sapphire into ajshort-togglecompositefield 2012-06-13 10:23:22 +02:00
Will Rossiter
78c15ea882 BUGFIX: Fix correct input type for ImageFormAction replaces. 
ImageFormAction is deprecated, using the new API results in a submit input rather than an image input being generated. Added hasAttribute helper to FormField as well as test coverage.
 2012-06-13 09:57:54 +02:00
Andrew Short
aa67b56b10 ENHANCEMENT: Refactored ToggleCompositeField. 
* Use jquery ui accordion for the field, and implemented an admin theme.
* Made the setting of configuration consistent with other form fields.
* ToggleComposteField->startClosed() has been deprecated in favour of
  setStartClosed().
* Removed public access to the heading level, instead use getHeadingLevel()
  or setHeadingLevel().
 2012-06-13 14:20:27 +10:00
Naomi Guyer
e96ca5fb9a ENHANCEMENT: Change media insertion to use button and apply design 
Conflicts:

	css/UploadField.css
	scss/UploadField.scss
 2012-06-11 10:54:48 +02:00
Sean Harvey
3f68e6f82f BUGFIX Ensure that a single string value (as opposed to an array of 
values) is accepted by implode() in CheckboxSetField by casting it
as an array.
 2012-06-11 13:41:02 +12:00
Ingo Schommer
210e32d631 MINOR Labeling in HtmlEditorField 2012-06-08 18:40:33 +02:00
Naomi Guyer
7523f98e04 BUGFIXES: File Uploads 
* Add arrows back to edit-all toggle button
* Don't show dimensions if the item being inserted doesn't have them.
* Set pop-up windows to be a percentage of the window height for better
use of space
* Fix broken fieldholdersmall styling within files edit
* Add placeholder if no preview
*Take out minFileSize so upload will work on Android phones
 2012-06-08 18:40:33 +02:00
Sam Minnee
948ca468f6 API CHANGE: Added $value argument as the first argument of a gridfield formattting callback. 2012-06-06 16:13:57 +12:00
Sam Minnee
70d5ffefdd API CHANGE: Added GridField::addDataFields() to allow the definition of custom callbacks to be used by all GridField components. 
API CHANGE: Added GridField::getDataFieldValue() to encapsulate field lookup for all components.
API CHANGE: Allow 'callback' key to be specified in a GridFieldDataColumn column info.  In this case, title should be put as the 'title' key of a map rather than simply the column info.
 2012-06-06 16:12:05 +12:00
Ingo Schommer
12f2e1e176 Merge branch 'pjax-multiple' 2012-06-05 14:01:18 +02:00
Mateusz Uzdowski
64c0d2fb0a MINOR: add comments to FormField's RightTitle 2012-06-01 15:01:42 +12:00
Sean Harvey
5462cdaab2 MINOR Removing "." from the end of validation messages 2012-06-01 13:13:06 +12:00
Sean Harvey
7fe0858be1 API CHANGE Marked Form::unsetFieldFromTab() as deprecated. Please use 
Fields() and the FieldList API instead.
 2012-05-31 14:29:58 +12:00
Ingo Schommer
5178954311 UNFINISHED Processing multiple PJAX responses on CMS JavaScript, introducing data-pjax-fragment attribute to identify reloadable template parts 2012-05-30 15:07:13 +02:00
Ingo Schommer
21beb86f8f MINOR Using localized name rather than model class for GridFieldAddNewButton UI (related to 74d444cf and pull request #452) 2012-05-29 15:22:28 +02:00
Ingo Schommer
5b03f49245 BUGFIX Respecting server-overrides on X-Pjax responses during ajax redirects. Fixes GridFieldDetailForm redirect after delete, e.g. in ModelAdmin. Partially reverts 8b4b896. Closes pull request #488 2012-05-29 11:34:47 +02:00
Sean Harvey
d7a8fa9266 BUGFIX If RequiredFields::php() is given any fieldName that is NULL, don't attempt to validate a NULL field. 2012-05-29 14:37:26 +12:00
Sean Harvey
0235a8c0c7 BUGFIX Partially reverting 28e43bdc which broke media insertion 2012-05-28 22:27:20 +12:00
Sean Harvey
c3eabffcb9 MINOR Use shorthand {class}::get() syntax instead of DataList::create() 
in core code.
 2012-05-28 21:13:42 +12:00
Sean Harvey
71256ea7f8 MINOR Update class docs for OptionsetField to use short DataList query 2012-05-28 21:12:59 +12:00
Sam Minnee
867b9a37d2 Merge branch 'master' of github.com:silverstripe/sapphire 2012-05-28 13:26:06 +12:00
Sam Minnee
7994b73cb7 MINOR: Added i18n to Delete action 2012-05-28 12:05:41 +12:00
Jeremy Bridson
fb78cab8e6 ENHANCEMENT:Trac#7218 - changed delete button on gridfield to cross and added tooltips for both edit and delete. 2012-05-28 12:03:38 +12:00
Sam Minnée
881c186f6d Merge pull request #493 from halkyon/addnew_button_name 
ENHANCEMENT Allow calling setButtonName() on a GridFieldAddNewButton to ...
 2012-05-27 16:58:49 -07:00
Sean Harvey
0952df49fb ENHANCEMENT Allow calling setButtonName() on a GridFieldAddNewButton to customise the button name 2012-05-28 11:55:43 +12:00
Naomi Guyer
28e43bdc88 ENHANCEMENT: File/Image UI fixes 
* Replaced cancel/delete button in files area
* Consolidated Image upload styles with AssetUpload styles
* Changed name of step 2 in image upload
* Made image editing hidden by default, so multiple files can be seen,
and added ability top open and close
* Tweaked styles in on page upload field (status colour and file name
width)
 2012-05-28 11:50:34 +12:00
Sean Harvey
74d444cf2f BUGFIX Ensure "Add [modelClass]" is shown instead of using the field name of the GridField, partially reverts 16982ba17c which broke breadcrumbs in SecurityAdmin 2012-05-28 11:43:47 +12:00
Sam Minnée
497aa9bfa9 Merge pull request #490 from simonwelsh/cms-oembed 
BUGFIX: Provide a default width and height of 100px for those endpoints ...
 2012-05-24 20:49:54 -07:00
Simon Welsh
15a5dab395 MINOR: Add a fallback thumbnail image for oEmbed inserts 2012-05-25 15:40:17 +12:00
Ingo Schommer
5b0734943f MINOR Fixed GridFieldAddNewButton label 2012-05-24 23:39:47 +02:00
Ingo Schommer
fa445ad13f Merge pull request #452 from adrexia/sapphire 
---

* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments

Conflicts:
	css/AssetUploadField.css
	css/GridField.css
 2012-05-24 23:06:46 +02:00
Simon Welsh
30ecb9f531 BUGFIX: Provide a default width and height of 100px for those endpoints that don't provide one. 2012-05-24 18:16:00 +12:00
Mateusz Uzdowski
63ed0cba32 BUGFIX: return a meaningful translatable string when resource is invalid 2012-05-24 17:00:21 +12:00
Simon Welsh
bb29ff3611 FEATURE: Allow adding media to the CMS using oEmbed 2012-05-24 17:00:21 +12:00
Sean Harvey
1ed5e3c9be Merge pull request #485 from halkyon/deprecate_director_statics_for_controller 
Deprecate director controller static functions
 2012-05-23 15:54:57 -07:00
Sean Harvey
a84ef8d8f3 MINOR Don't use template method Actions internally in Form 2012-05-24 10:49:47 +12:00
Sean Harvey
c7e0cee637 API CHANGE Add Form->getController() and use this instead of Controller::curr() in FileIFrameField 
API CHANGE Add Form->getName() and deprecate Form->Name(), use getName() instead.
 2012-05-24 10:46:57 +12:00
Sean Harvey
60c72c40d9 API CHANGE Use of the DropdownField $emptyString argument is now 
properly deprecated (has been marked as deprecated since 2.3). Please
use setEmptyString() on the DropdownField instance instead.
 2012-05-23 22:59:40 +12:00
Sean Harvey
77c2365b87 MINOR Replacing deprecated static function calls to Director with 
current Controller instance replacements.
 2012-05-23 21:50:02 +12:00
Naomi Guyer
16982ba17c ENHANCEMENT: Make GridFieldAddNewButton Content more specific 
* Alter Grid Field "Add New" Button to take the name of the table (i.e.
"Add Member")
* Alter table names in security section to be singular so the button
text makes sense
 2012-05-21 17:47:14 +12:00
Naomi Guyer
1747298786 ENHANCEMENT: Make GridFieldButtonRow more adaptable 
* Add ability to choose where to put buttons (in buttonRow, toolbar
header, etc)
* Adjust styles to take these changes into account
 2012-05-21 14:41:46 +12:00
Naomi Guyer
a7336e9dca ENHANCEMENT: Move GridField buttons out of table (fixes 7213) 
* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments
 2012-05-21 14:19:59 +12:00
Sean Harvey
7dc2d61871 MINOR Removing whitespace 2012-05-18 18:05:45 +12:00
Naomi Guyer
a412aa0ce4 BUGFIX: Filter IDs 
Change ID of action buttons in the filter panel to be unique
 2012-05-18 18:01:07 +12:00
Sean Harvey
3f932d6bad Merge pull request #464 from mateusz/os7299 
BUGFIX: add capability of redirecting form actions.
 2012-05-17 22:44:05 -07:00
Mateusz Uzdowski
8b4b896578 BUGFIX: add capability of redirecting form actions. 
Form actions assume that they are reloading the form afterwards. But
this is not always the case - for example "delete" action will redirect
back to the panel, so we need to be able to set the X-Pjax headers
accordingly.
 2012-05-18 17:36:06 +12:00
Sam Minnee
1025524d8c API CHANGE: Added $insertBefore argument to GridFiedlConfig::addComponent() 2012-05-18 16:15:14 +12:00
Sam Minnee
c8e994d573 BUGFIX: Allow modification of a config's components after the grid field is instantiated. 2012-05-18 16:15:13 +12:00
Normann Lou
5290b81c55 ENHANCEMENT: don't show the paginating elements in the paginator when only one page, and keep 'view 1 - 5 of 5' there 2012-05-18 11:31:33 +12:00
Sean Harvey
18a92f922b Merge pull request #454 from adrexia/7215-Fix-design-toggle-searchfields-gridfield 
BUGFIX: GridField filter
 2012-05-17 15:19:46 -07:00
Sean Harvey
e2aa635323 BUGFIX Ensure GridFieldExportButton uses "text/csv" as the MIME type 2012-05-17 14:54:29 +12:00
Naomi Guyer
f0c61c20df BUGFIX: GridField filter 
Make sure the new class is used consistently, and has the correct css
applied to it.
 2012-05-17 11:15:53 +12:00
Naomi Guyer
6c8dbe1a56 BUGFIX: Fix where filter appears 
Make filter only appear in GridFields that include the
GridFieldFilterHeader component
 2012-05-16 16:50:11 +12:00
Naomi Guyer
458171ff92 ENHANCEMENT: Gridfield usability (fixes 7215) 
1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates
(spans were being inserted inside spans), and adjusted styles. Added
extra class to template
5. Added "filter by ..." placeholder text to input fields
 2012-05-16 12:18:23 +12:00
Ingo Schommer
0a6ec3d9c9 Merge pull request #443 from halkyon/sapphire 
---
 2012-05-14 15:33:48 +02:00
Ingo Schommer
45ae2465e8 Merge pull request #438 from ajshort/sapphire 
---

These are some enhancements + tweaks I made as part of getting the advanced workflow module running in SS3:

* Added a readonly view button and action to GridField.
* Made LeftAndMain::getResponseNegotiator() public so CMS extensions can use it to generate responses.
* Fixed top tab background, made text more readable (http://i.imgur.com/yDmmY.png).
* Allow fields in the CMS to not be change tracked using ".no-change-track".
* Made all icons 16x16 (some were different sizes, being cut off), and allow them without .ui-state-default.
* Fixed ToggleCompositeField and tweaked field styling.
 2012-05-14 14:25:16 +02:00
Sean Harvey
9da92e04cf API CHANGE Renamed setContainerFieldSet() to setContainerFieldList() to match the FieldList API. 
API CHANGE Renamed rootFieldSet() to rootFieldList() to match the FieldList API.
 2012-05-14 15:16:44 +12:00
Sean Harvey
a53cca8932 MINOR Renaming getFieldSet with getFieldList in FormScaffolder 2012-05-14 15:03:22 +12:00
Andrew Short
05cde92508 FEATURE: Implemented a view action for GridField, and a record viewing GridFieldConfig. 2012-05-12 18:49:56 +10:00
Ingo Schommer
ffbcf634bb Merge pull request #420 from chillu/sapphire 
---

See http://open.silverstripe.org/ticket/7261
 2012-05-11 13:42:47 +02:00
Sean Harvey
39bd89879e BUGFIX Setting MIME type for TableListField export explicitly, as HTTP::get_mime_type() requires a path to an actual file, in this case we're exporting data directly to the browser. 2012-05-11 14:26:25 +12:00
Ingo Schommer
6956b1be5c Merge pull request #412 from adrexia/sapphire 
---

The two bug fixes impact on the file area, but have wider reach.

BUGFIX: Colour Adjustments
Change the constructive button colour to match the colour used in the designs, and fix up calculations to produce the correct button colour.

BUGFIX: IE Colours
Replace hard coded colours in IE with variables, and refactor code so that shared IE7 and IE8 fixes are in one place.

ENHANCEMENT: UI Changes to FileUpload Area (TRAC-7219)
1. Add arrows to edit dropdowns
2. Adjust lightened fields so they dont look like input boxes, and fix rgba colours
3. Add ability to click file names to edit
4. Add feedback when edit button is hovered
5. Add feedback if a file has been opened for editing and shut again (saved changes, unsaved changes, unchanged)
6. Add ability to open and close all files to edit them all at once
7. Add overall feedback for file uploads, and fix NaN error
8. Fix up area to match design
9. Fix error messages so they fit in the provided space
10. Fix case where a single uploaded file errors
 2012-05-10 10:27:11 +02:00
Sean Harvey
c1f7e0ed48 BUGFIX #7298 Fixed incorrect message in GridFieldDetailForm from en.yml language file. 2012-05-10 15:46:54 +12:00
Ingo Schommer
8c9560d288 ENHANCEMENT FieldList->setTabPathRewrites() for better backwards compatibility (see #7261) 2012-05-09 17:18:16 +02:00
Naomi Guyer
d642eee28e ENHANCEMENT: UI Changes to FileUpload Area (TRAC-7219) 
1. Add arrows to edit dropdowns
2. Adjust lightened fields so they don't look like input boxes, and fix
rgba colours
3. Add ability to click file names to edit
4. Add feedback when edit button is hovered
5. Add feedback if a file has been opened for editing and shut again
(saved changes, unsaved changes, unchanged)
6. Add ability to open and close all files to edit them all at once
7. Add overall feedback for file uploads, and fix NaN error
8. Fix up area to match design
9. Fix error messages so they fit in the provided space
10. Fix case where a single uploaded file errors
 2012-05-09 18:38:21 +12:00
Sean Harvey
fdebedd103 BUGFIX Ensure the form inside htmleditorfield-dialog element is redrawn when the form is lazy loaded by AJAX. 2012-05-09 17:11:59 +12:00
Stig Lindqvist
0af2d87bb3 MINOR Cleaned up the GridFieldDataColumns to be easier on the eyes and fixed the some method docblocks for the interface 2012-05-09 10:35:35 +12:00
Ingo Schommer
592d42e477 MINOR Stop using deprecated getTabIndex() in CreditCardField 2012-05-08 14:26:22 +02:00
Ingo Schommer
a2dbd69f2c ENHANCEMENT Allow Controllers to opt-out or modify the back link behaviour in GridFieldDetailForm 2012-05-08 11:25:47 +02:00
Ingo Schommer
6d999aa6ba ENHANCEMENT addExtraClass() support for Tab and TabSet 2012-05-08 11:25:44 +02:00
Normann Lou
7324712e9e FEATURE: add Levelup component to GridField as GridFieldLevelup 2012-05-07 13:40:53 +12:00
Normann Lou
3b3b515571 API CHANGE Read-only fields no longer include companion hidden fields (see pull request #399) 
BUGFIX Remove legacy code and template which is never picked-up so that TextareaField becomes 'readonly' when it is transfered to readonly field. Change TextareaFieldTest test cases to address a 'readonly' textarea field displaying the special html characters correctly.
 2012-05-03 14:24:03 +02:00
Sean Harvey
151abde17d Merge pull request #388 from chillu/trac/7170-i18n-sprintf-injections 
#7170 i18n sprintf injections
 2012-05-02 16:18:30 -07:00
Sean Harvey
6483cdd204 Merge pull request #382 from chillu/trac/7217-group-default-on-member 
Group default on member (#7217)
 2012-05-01 21:43:05 -07:00
Ingo Schommer
7b18d9d0da MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:17:00 +02:00
Ingo Schommer
2288d80c30 Merge pull request #387 from sminnee/sapphire 
---

The primary goal of this branch was to fix the sort bugs in AssetAdmin, however, it started a bit of a yak shave in that the API around SQLQuery was poor.  The biggest change that this pull request makes is it changes the format of SQLQuery::$select to contain aliases as array keys (and consistently puts the "implicit alias" in there to assist with various query generation logic), but it also makes a bunch of changes to avoid direct access of that property.
 2012-05-01 17:57:03 +02:00
Sam Minnee
8661164c19 API CHANGE: Add SQLQuery::clearSelect(), SQLQuery::selectField() and SQLQuery::itemisedSelect() to make it easier for other subsystems to use SQLQuery without resorting to direct property access. 
API CHANGE: Remove DataQuery::select() in place of DataQuery::selectField().
BUGFIX: Remove direct property access to SQLQuery::$select
 2012-05-01 17:57:39 +12:00
Sean Harvey
390d3d3fc4 MINOR Fixed broken notice 2012-05-01 17:37:18 +12:00
Sean Harvey
0882741f54 API CHANGE Renamed setModel for DataModel instances to setDataModel for 
semantics, and also to allow a field name called "Model"
 2012-05-01 14:45:44 +12:00
Mateusz Uzdowski
ee360c1877 BUGFIX: include derived classes for attaching in the UploadField. 2012-05-01 13:37:15 +12:00
Ingo Schommer
c2339d2181 API CHANGE Removed FormResponse handling for erroneous ajax requests in Form->validate(), use javascript validation instead, or reload the whole form with new HTML including the error messages 2012-04-30 17:15:30 +02:00
Ingo Schommer
f873707e9d ENHANCEMENT Prepopulating group on new members (fixes #7217) 2012-04-30 14:35:25 +02:00
Ingo Schommer
72eadef113 ENHANCEMENT GridFieldDetailForm->setItemEditFormCallback() 2012-04-30 13:46:51 +02:00
Ingo Schommer
fed2785173 ENHANCEMENT Per-instance customisation of GridFieldDetailForm_ItemRequest 2012-04-30 12:31:17 +02:00
Ingo Schommer
8489ff37db Merge pull request #359 from silverstripe-big-o/sapphire 
---

When open an image form loaded from TinyMCE Content, change the looks of the popup, such as popup heading (change from "Insert Image" to "Update Image"), action button label (change from "Insert" to "Update"), hiding the cancelling button on the top right corner which still needs to show when in inserting mode

Conflicts:
	lang/en.yml
 2012-04-27 10:15:16 +02:00
Mateusz Uzdowski
b561786825 MINOR: change the ugly user-facing CSRF message to more friendly 
User does not necessarily knows what CSRF is, and tends to get scared by
this, thinking he has abused something. On the other hand users tend to
know what session expiry means.
 2012-04-26 13:57:16 +12:00
Sean Harvey
bb20587f01 ENHANCEMENT GridFieldExportButton allows an anon function to return the 
value of a related object. Useful for handling has_many/many_many data
in a single CSV column.
 2012-04-23 20:26:41 +12:00
Mateusz Uzdowski
fbbdbbcb3b BUGFIX: list only files the autoset relation supports in UploadField 
Otherwise when user selects an object that does not fit the relation,
the system will throw an Exception.
 2012-04-23 15:01:59 +12:00
Mateusz Uzdowski
47e3052aaa ENHANCEMENT: allow folder selection when attaching files from the CMS 
http://open.silverstripe.org/ticket/7046
UploadField would default to one folder only, and wouldn't allow asset
tree traversal. HtmlEditorField MediaForm has this capability, so added
it here in a similar fashion via TreeDropdownField.
 2012-04-23 12:08:16 +12:00
Sean Harvey
e12a82e28f MINOR Documentation on EmailField type attribute change 2012-04-21 11:09:34 +12:00
Normann Lou
e1372b3794 ENHANCEMENT: toggle header and action label for image dialog popups (from content TinyMCE image icon) 2012-04-20 18:04:49 +12:00
Simon Welsh
13865cb7ac BUGFIX Don't filter out attributes that are '0' 2012-04-20 12:22:40 +12:00
Sean Harvey
80facbd81b BUGFIX Ensure merging correctly 2012-04-19 14:26:26 +12:00
Sean Harvey
23c3fb83fb ENHANCEMENT EmailField now uses type="email", which has the benefit of 
allowing email validation when using the required="required" attribute.
If using an old browser, the "email" type will fallback to "text"
 2012-04-19 14:06:47 +12:00
Robert Curry
842784c8aa ENHANCEMENT: Fixes #7010. Move DisplayFields, FieldCasting and FieldFormatting functions from GridField to GridFieldDataColumns. 2012-04-19 12:44:59 +12:00
Mateusz Uzdowski
a9e7de0cf4 BUGFIX: make UploadField aware of relations to derived classes (os7140) 
UploadField was relying entirely on the File::get_class_for_file_extension to
select a class, so it could only create File or Image objects. This
would break the relationships based on derived objects. Also make it
respect the FileField::relationAutoSetting.
 2012-04-19 12:18:36 +12:00
Mateusz Uzdowski
47d7392e88 BUGFIX: remove unnecessary write from uploading routine 2012-04-19 12:13:03 +12:00
Mateusz Uzdowski
5d7f6a0d69 MINOR: add some comments to UploadField 2012-04-19 12:13:03 +12:00
Ingo Schommer
7f62ad0f3e Merge branch 'master' into 7094-combine-tree-edit-view 2012-04-18 14:19:55 +02:00
Robert Curry
5603fbe153 ENHANCEMENT: Fixes #7059. Add test for allowedMaxFileNumber to UploadFieldTest. 2012-04-18 14:25:14 +12:00
Ingo Schommer
a393d3937b ENHANCEMENT Anonymous function support in GridField->setFieldFormatting() 2012-04-17 17:11:43 +02:00
Ingo Schommer
ee70e0a5b7 MINOR Fixed returns of Form->unsetValidator() 2012-04-17 11:03:09 +02:00
Sean Harvey
5bb31c4e81 BUGFIX Stop "Insert Link" or "Insert Image" header disappearing inside the HtmlEditorField toolbar 
when clicking a link type
 2012-04-17 15:47:40 +12:00
Mateusz Uzdowski
59663f9289 BUGFIX: fix up some E_STRICT errors 2012-04-17 11:51:55 +12:00
Ingo Schommer
d44f6b3e1f MINOR Removed deprecated usage of $priority argument in _t() calls 2012-04-15 17:17:17 +02:00
Sean Harvey
d7973ea006 MINOR Don't show warning if running tests 2012-04-15 10:50:20 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Sean Harvey
7e3a698d56 BUGFIX Fixed missing $properties arg to DatalessField::SmallFieldHolder 2012-04-14 23:40:03 +12:00
Will Rossiter
7df26fd702 BUGFIX: fix missing TabSet template from previous changes and selection group using wrong holder. 2012-04-14 22:08:00 +12:00
Will Rossiter
07d2d5273a ENHANCEMENT: populate FormField:: on the fly based on class name of field rather than requiring explict definition. 2012-04-14 17:36:19 +12:00
Will Rossiter
907568b182 ENHANCEMENT: move hard coded template HTML for composite field and field group out to separate template files. 2012-04-14 17:36:08 +12:00
Ingo Schommer
b025b95ede ENHANCEMENT Lazy-loading image and link dialogs for HtmlEditorField, to avoid unnecessary processing overhead on initial CMS load (also means they'll never get loaded if not required, e.g. in ReportAdmin) 2012-04-12 23:53:12 +02:00
Sam Minnée
977e9f3576 Merge pull request #306 from silverstripe-big-o/report-fixes 
API-CHANGE: new GridFieldFooter component
 2012-04-11 22:30:10 -07:00
Julian Seidenberg
e9dc610448 API-CHANGE: new GridFieldFooter component 2012-04-12 16:13:47 +12:00
Sean Harvey
2b8e14fdff API CHANGE Fixing CompositeField/SelectionGroup 
performReadonlyTransformation and performDisabledTransformation to be
consistent and conform with parent FormField. $trans argument is no longer allowed, just uses
DisabledTransformation or ReadonlyTransformation instead.
 2012-04-12 12:24:06 +12:00
Sean Harvey
852ffcf492 MINOR MemberDatetimeOptionsetField::validate() now passes in $validator argument instead of getting it from the form, which is how other FormFields work like CompositeField 2012-04-12 12:23:18 +12:00
Sean Harvey
865cde0c39 BUGFIX FormField::name_to_label() is now declared as static as it was never used as an instance method 
API CHANGE FormField::validate() $validator argument is now required for FormField classes
 2012-04-12 12:18:55 +12:00
Sean Harvey
8369cded32 MINOR Code formatting in EmailField 2012-04-12 12:17:30 +12:00
Sean Harvey
1e61b76ca8 MINOR ConfirmedPasswordField::validate() now passes in $validator 
argument instead of getting it from the form, which is how other
FormFields work like CompositeField
 2012-04-12 12:14:42 +12:00
Sean Harvey
859f7add20 MINOR TableField_Item::Fields() now conforms to parent 
TableListField_Item::Fields() for E_STRICT compliance
 2012-04-12 12:13:22 +12:00
Sean Harvey
42988ecb18 BUGFIX Argument hinting of FormField instance for TabSet::push() to 
comply with parent CompositeField::push() for E_STRICT compliance
 2012-04-12 12:11:53 +12:00
Sean Harvey
9cf1686786 MINOR Code formatting fixes for CurrencyField 2012-04-12 12:11:22 +12:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration' 
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
 2012-04-11 16:31:12 +02:00
Ingo Schommer
6cd91ff449 Merge pull request #299 from ajoneil/sapphire 
---

Conflicts:
	forms/NumericField.php
 2012-04-11 15:36:35 +02:00
Andrew O'Neil
716ff9dcfa MINOR: Ensure all form fields have FieldHolder() with identical signature to FormField::FieldHolder(). Fixes E_STRICT warnings. 2012-04-11 18:07:55 +12:00
Andrew O'Neil
4be59a8d45 MINOR: Ensure all form fields Field() method has the same signature as FormField::Field(). Fixes E_STRICT warnings. 2012-04-11 17:33:36 +12:00
Andrew O'Neil
daab8f4cbc MINOR: Consistently use DataObjectInterface for saveInto() on FormField subclasses. Fixes E_STRICT notice 2012-04-11 17:00:57 +12:00
Andrew O'Neil
f811103243 MINOR: Remove redundant setDisabled() methods - this method already exists in FormField. Fixes E_STRICT notice. 2012-04-11 16:17:44 +12:00
Sean Harvey
3e307e00fe MINOR Removing old remains of NumericField.js validation which was 
removed in 9f3344b355
 2012-04-11 15:55:07 +12:00
Ingo Schommer
a64715beeb BUGFIX Calling tinyMCE.init() in sync with entwine rules to avoid uncached loading interfereing with call order (fixes #6877) 2012-04-10 21:41:00 +02:00
Normann Lou
6671ae7ee9 BUGFIX SSF-124 remove $extraClass in the sortable header of GridField, simply add an 'col-$getName' as the distinguishable class for each column header, so as not to lose the css selector 2012-04-10 17:55:14 +12:00
Normann Lou
26cec90ba7 ENHANCEMENT: SSF-124 make GridFieldSortableHeader to show the extra classes for each of the header field. 2012-04-10 12:04:22 +12:00
Julian Seidenberg
93563021c6 BUGFIX: SSF-168 adding Grid field print header default of null 2012-04-10 11:15:53 +12:00
Ingo Schommer
cf304044b8 Merge branch 'master' into integration 2012-04-10 00:39:29 +02:00
Ingo Schommer
1742b4b742 BUGFIX Fixed loading/saving regressions due to new PJAX logic introduced in e01b0aa3d0 2012-04-10 00:37:14 +02:00
Ingo Schommer
373d9e7b8f Merge branch 'master' into integration 2012-04-09 21:35:30 +02:00
Ingo Schommer
c2f7bf4dcf MINOR Fixed FormField::create() usage 2012-04-09 21:35:07 +02:00
Ingo Schommer
8c5e56fe31 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html
 2012-04-09 21:10:08 +02:00
Ingo Schommer
a44b67bae2 API CHANGE Moved RequestHandler->isAjax() to SS_HTTPRequest->isAjax() 2012-04-05 23:00:22 +02:00
Normann Lou
a946096e29 MINOR: SSF-168 code convention correction 
MINOR: SSF-168 add _t()'s where necessory in GridField print view
 2012-04-05 11:02:42 +12:00
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Ingo Schommer
6517f4496b Merge pull request #273 from ajoneil/sapphire 
---

This allows DataList::create(SiteTree) as equivalent to Object::create(DataList, SiteTree), without
having to have a create() function on DataList.

Required for E_STRICT compliance, as child classes cant override create() if they change the arguments.

DBField::create() is also renamed to DBField::create_field(), as this does not just call the constructor, which all other cases of create() do.

Conflicts:
	tests/model/DateTest.php
	tests/model/DatetimeTest.php
 2012-04-04 16:48:16 +02:00
Felipe Skroski
7740bb326a ENHANCEMENT SSF-168 moved print and csv export buttons to the top of the grid 2012-04-04 14:09:52 +12:00
Felipe Skroski
4ffef20b09 ENHANCEMENT: SSF-168 updated print styles to the datagrid 2012-04-04 14:09:52 +12:00
Normann Lou
721184c4b3 MINOR SSF-297 add more available information to GridField print view 2012-04-04 14:07:07 +12:00
Normann Lou
95cdfd7903 BUGFIX destroy $item in the scope of where $item is defined for GridFieldPrintButton->generatePrintData. 2012-04-04 11:29:25 +12:00
Simon Elvery
429ff64d7c Merge branch 'master' of https://github.com/silverstripe/sapphire.git into forms 2012-04-03 15:06:23 +10:00
Simon Elvery
68db977ef1 MINOR: Provide a setter for heading level on HeaderField object. 2012-04-03 15:05:21 +10:00
Normann Lou
d71b04fa19 ENHANCEMENT make gridfield status applied with header filter and header sort before print 2012-04-03 17:04:19 +12:00
Normann Lou
ba02e500e7 FEATURE added GridFieldPrintButton compoonent 2012-04-03 16:57:48 +12:00
Normann Lou
00b904b01c ENHANCEMENT make gridfield status applied with header filter and header sort before export 2012-04-03 16:57:48 +12:00
Julian Seidenberg
98e197aff9 MINOR: SSF-38 renaming the PageUploadField template to HtmlEditorField_UploadField 2012-03-30 13:44:39 +13:00
Julian Seidenberg
ca83d845e1 ENHANCEMENT: SSF-38 added new template for the upload field that is used within a page image insertion dialog box. This upload field is slightly different from the one used in Files. E.g. it uses smaller fonts (h4 instead of h3) 2012-03-29 16:55:51 +13:00
Julian Seidenberg
94e21d18e1 MINOR: SSF-38 i18n of some of the form 2012-03-29 15:09:20 +13:00
Julian Seidenberg
9f9dc25338 ENHANCEMENT: SSF-38 initial rearranging of the insert image form to allow uploads as well as choosing an image from the CMS (and you can pick and choose from both) 2012-03-29 13:34:55 +13:00
Ingo Schommer
f0ee711f52 Merge pull request #275 from halkyon/e_strict_support 
First round of fixes for E_STRICT compliance
 2012-03-28 02:42:26 -07:00
Sean Harvey
e097f6e1a8 MINOR Fixes to method arguments in core classes for E_STRICT support. 
API CHANGE Remove abstract static function and just use static functions
in Authenticator (PHP 5.3+ doesn't support abstract static functions)
 2012-03-28 22:41:42 +13:00
Ingo Schommer
f81ad47239 Merge pull request #272 from halkyon/date_fixes 
DateField::setValue() with dmyfields sets erroneous date in valueObj
 2012-03-28 02:38:03 -07:00
Normann Lou
9e60225064 MINOR : Update core docs to use DataList::create() rather than DataObject::get()/get_one()/get_by_id() where appropriate - Trac#6891 2012-03-27 17:02:18 +02:00
Andrew O'Neil
de2832e65f ENHANCEMENT: Allow Object::create() to be called with late static binding. 
This allows DataList::create('SiteTree') as equivalent to Object::create('DataList', 'SiteTree'), without
having to have a create() function on DataList. Required for E_STRICT compliance.
 2012-03-27 17:57:42 +13:00
Sean Harvey
c02b4418bb BUGFIX Using DateField "dmyfields" option, if you set empty 
day/month/year values, valueObj on DateField will contain erroneous values.
Check that all the value inputs aren't null or empty values BEFORE
calling Zend_Date on the value.
 2012-03-27 14:46:09 +13:00
Sean Harvey
4bcd44aee6 ENHANCEMENT GridFieldExportButton now supports dot syntax for column sources through DataObject::relField() 2012-03-25 19:54:38 +13:00
Sam Minnée
5061c8c608 Merge pull request #256 from halkyon/cleanup 
GridFieldDeleteAction minor tidy up
 2012-03-23 18:09:02 -07:00
Nicolaas
dee3939cf7 BUGFIX: Fix the broken perform readonly transformation which was always showing NO (#6453) 2012-03-24 13:35:19 +13:00
Simon Welsh
fa999ca2de BUGFIX TableListField should only include CSS from the cms if the cms exists. 2012-03-24 11:49:48 +13:00
Sean Harvey
3a91a97f89 MINOR Fixed grammatical error in GridFieldDeleteAction class 
documentation
 2012-03-23 10:59:17 +13:00
Sean Harvey
98cc25a5fe MINOR Tidy up of class documentation for GridFieldDeleteAction 2012-03-23 10:53:32 +13:00
Sean Harvey
239b4a01f7 MINOR Rename argument to GridFieldDeleteAction to match the property 
name $removeRelation
MINOR Tidy up coding standards in GridFieldDeleteAction
 2012-03-23 10:51:23 +13:00
Sean Harvey
ff4c82039d MINOR Class documentation for GridFieldDeleteAction 2012-03-23 10:50:17 +13:00
Sean Harvey
4da42f2baf MINOR Revert folderName change to UploadField (already exists on 
FileField parent)
 2012-03-23 09:22:54 +13:00
Ingo Schommer
0ad6fe7ec1 Merge pull request #250 from sminnee/form-head-request-throws-500 
Return 404 rather than 500 on bad actions in requesthandler
 2012-03-22 12:45:12 -07:00
Sean Harvey
b5d4234dfd MINOR Correct DropdownField class documentation to include a proper 
example using DataList and non-deprecated way of setting the empty value
and string
 2012-03-20 15:47:22 +13:00
Sean Harvey
f85f30ac61 BUGFIX DropdownField with SS_Map as the source should use empty string 
as the value, and the empty string text as the title, not the other way
around.
 2012-03-20 15:34:10 +13:00
Sam Minnee
1d5065f4a7 BUGFIX: Removed reference to non-existence function Form::handleAction(). 2012-03-19 13:10:51 +13:00
Ingo Schommer
161a5ca209 Merge pull request #249 from sminnee/form-head-request-throws-500 
BUGFIX: Prevent 500 error when a HEAD request is sent to its action URL.
 2012-03-18 15:54:25 -07:00
Sam Minnee
067204d003 BUGFIX: Prevent 500 error when a HEAD request is sent to its action URL. 2012-03-19 09:26:20 +13:00
Simon Welsh
b9ab70a249 BUGFIX Don't try setting the value attribute on DropdownField or its subclasses. 2012-03-17 21:16:25 +13:00
Ingo Schommer
22dc7fd2d8 MINOR Warning about imminent TableField deprecation 2012-03-15 22:31:55 +01:00
Sean Harvey
5ce1dc1822 ENHANCEMENT Allow setting folderName to Upload in UploadField using 
setFolderName()
 2012-03-14 15:53:04 +13:00
Sean Harvey
54507d7a8f MINOR Fixed coding style in CreditCardField::Field() 2012-03-13 09:47:30 +13:00
Ingo Schommer
2d151b8cfa API CHANGE Deprecated TableListField and ComplexTableField, use GridField instead 2012-03-12 17:26:42 +01:00
Ingo Schommer
b246522c24 MINOR Various fixes to get TableListField and ComplexTableField baseline operational (although usage of GridField is encouraged) 2012-03-12 17:26:40 +01:00
Ingo Schommer
95f1800d80 BUGFIX Resolve local images correctly even with absolute URLs in HTMLEditorConfig_Toolbar, fixed display of remote images (don't try to format the thumbnail, which only works on local images) (fixes #6952) 2012-03-12 16:31:48 +01:00
Ingo Schommer
4fc3aaf939 Revert "ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field" - causes artificial loading delay, and doesn't detect height correctly due to floated images in paragraphs. These paragraphs can't be clearfix'ed because they'd become contenteditable (resizeable) elements in IE because of this. 
This reverts commit 69a8659a3d.
 2012-03-12 16:03:13 +01:00
Andrew O'Neil
199dd648da BUGFIX: Fix errors submitting a credit card field 2012-03-12 10:26:41 +01:00
Ingo Schommer
960e3428b6 MINOR Avoid wrapping GridField row buttons into multiple lines 2012-03-12 10:23:59 +01:00
Ingo Schommer
0d69126152 MINOR Fixed GridField conditional 2012-03-12 09:59:29 +01:00
Ingo Schommer
2ec9de1e59 MINOR Updated GridFieldDetailForm naming 2012-03-12 09:55:33 +01:00
Sam Minnee
7de5bf55e0 API CHANGE: Updated throwExceptionOnBadDataType setter to be standard setThrowExceptionOnBadDataType(), added getThrowExceptionOnBadDataType(). 2012-03-10 14:44:12 +13:00
Sam Minnée
aa83c114a6 Merge pull request #220 from oddnoc/6817-findOrMakeTab 
BUGFIX #6817: FieldList.php: findOrMakeTab () fails for nested TabSets
 2012-03-09 15:24:28 -08:00
Sam Minnée
603a984ad4 Merge pull request #236 from silverstripe-big-o/pull/SSF-25 
SSF-25: ModelAdmin
 2012-03-09 15:23:20 -08:00
Ingo Schommer
e6be56e3b4 API CHANGE Removed FormResponse class, use custom HTTP status codes to communicate state on text/html responses, or use text/json for more structured data responses 2012-03-09 23:27:39 +01:00
Ingo Schommer
fa6142cba5 API CHANGE Removed deprecated TableListField->ajax_refresh() 2012-03-09 23:17:05 +01:00
Ingo Schommer
1ba5e79e3b MINOR Re-fetching relationship in ListboxField->saveInto() when dealing with new records, to avoid errors on RelationList without foreign keys (fixes #6925) 2012-03-09 22:32:12 +01:00
Fred Condo
594448499b BUGFIX: Don't try to set the title if it hasn't been set for us. 
This enables the new code to pass the existing tests.
 2012-03-09 11:14:06 -08:00
Fred Condo
595a6dc333 BUGFIX #6817: FieldList.php: findOrMakeTab () fails for nested TabSets 
- Implements recommended solution from bug report.
- Calculates last index only once instead of at each loop iteration.
- There was no existing test for this method, so if someone can implement a test, that would be great.
 2012-03-09 10:44:47 -08:00
Ingo Schommer
4e1c8bdb32 Merge branch 'fieldlist-fortemplate' of https://github.com/sminnee/sapphire 
Conflicts:
	forms/FieldList.php
 2012-03-09 17:03:02 +01:00
Ingo Schommer
1f01e1135d API CHANGE Removing ScaffoldingComplexTableField, using GridField instead to edit relationships through FormScaffolder and DataObject->scaffoldFormFields() 2012-03-09 15:16:01 +01:00
Sam Minnee
d04fe07fa6 BUGFIX: Renamed UploadField::$config to UploadField::$ufConfig to avoid conflicts with the config API. 2012-03-09 19:37:43 +13:00
Sam Minnee
1f7263e55e ENHANCEMENT: Updated default many-many grid field to show "add existing" and "add new" side by side. 2012-03-09 17:54:39 +13:00
Sam Minnee
818c341c57 API CHANGE: Created GridFieldAddNewButton, replacing the one that was previously hardcoded in GridFieldToolbarHeader 2012-03-09 17:52:26 +13:00
Sam Minnee
12618e2027 API CHANGE: Added targetFragment argument to GridFieldAddExistingAutocompleter, so that its location can be changed. Updated CSS and HTML to allow for this. 2012-03-09 17:52:26 +13:00
Sam Minnee
d795a55bdb API CHANGE: Removed 'add new' button from GridFieldToolbarHeader, instead opting to include two HTML fragments: toolbar-header-left and toolbar-header-right. 2012-03-09 17:52:26 +13:00
Sam Minnee
92a3535455 API CHANGE: Added targetFragment argument to GridFieldExportButton to control button placement. Moved search fields to 2nd argument. 2012-03-09 17:52:26 +13:00
Sam Minnee
adbcf61c56 MINOR: Minor fixes after new SS_List interfaces cleanup 2012-03-09 17:50:32 +13:00
Stig Lindqvist
6d380cd546 BUGFIX GridFieldPaginator did not work correctly after SS_Limitable was introduced 2012-03-09 17:07:42 +13:00
Stig Lindqvist
b6803f6141 MINOR Check that component getActions returns an array before using it 2012-03-09 17:07:42 +13:00
Sam Minnee
426f16764c ENHANCEMENT: GridFieldComponents will now use SS_Filterable, SS_Sortable, and SS_Limitable to determine which features are applicable to the List provided, and either throw an error, or silently disable the feature. 
API CHANGE: Added throwExceptionOnBadDataType() to GridFilterFilter, GridFieldPaginator, and GridFieldSortableHeader.
 2012-03-09 17:07:41 +13:00
Sam Minnee
a55e06f6b5 API CHANGE: Introduce SS_Limitable class for adding to SS_Lists that have limit capability. 
API CHANGE: Deprecated SS_List::getRange() in favour of SS_Limitable::limit().
API CHANGE: Introduce SS_Limitable::limit($limit, $offset = 0) as the only modern way of specifying limits; deprecate all others.
 2012-03-09 17:07:40 +13:00
Sam Minnee
3d54668896 MINOR: Added explicit 'public' keyword on functions. 2012-03-09 15:42:31 +13:00
Sam Minnee
ba93028b01 API CHANGE: Added Form::VisibleFields() and FieldList::VisibleFields(), which list everything except hidden fields, to assist with the creation of custom form layouts. 2012-03-09 15:41:42 +13:00
Sam Minnee
a071456837 Merge branch 'master' of github.com:silverstripe/sapphire 
Conflicts:
	tests/forms/gridfield/GridFieldDetailFormTest.php
	tests/forms/gridfield/GridFieldPopupFormsTest.yml
 2012-03-09 14:37:32 +13:00
Stig Lindqvist
09d6fa7bb3 API CHANGE Renamed GridFieldDefaultColumns to GridFieldDataColumns #6921 2012-03-09 14:07:40 +13:00
Stig Lindqvist
6d0b0d6788 API CHANGE Removing GridFieldDeleteAction and moved functionality into GridFieldRemoveButton #6921 2012-03-09 13:55:49 +13:00
Stig Lindqvist
8b82dae06c API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
Sean Harvey
c59c717d78 API CHANGE Removed CustomRequiredFields, please use custom validation instead 
BUGFIX Ensure validators still used in ModelAdmin forms
 2012-03-09 12:45:18 +13:00
Sean Harvey
7eddf4298f Merge remote-tracking branch 'upstream/master' 2012-03-09 12:21:46 +13:00
Sean Harvey
9f3344b355 API CHANGE Removed built-in behaviour.js client-side form validation. 
This is no longer supported. Please use custom client-side validation instead. (see 3.0.0 changelog
for more information)
 2012-03-09 12:19:57 +13:00
Ingo Schommer
66f22441e5 MINOR Checking for existence of $searchFields in GridFieldRelationAdd 2012-03-08 23:56:46 +01:00
Stig Lindqvist
8b2213d56c MINOR Added per-record canView, canDelete, canCreate and canEdit checks on gridfield and gridfield components #6890 2012-03-09 10:58:01 +13:00
Sean Harvey
f86e53bad8 API CHANGE Removed Validator::showError(), Validator::getError() and 
Validator::getCombinedError(). Use Validator::getErrors() instead
 2012-03-09 10:31:00 +13:00
Sam Minnee
ed0e06c0f6 BUGFIX: Fix a couple of rebasing-related bugs in GridField. 2012-03-09 10:27:57 +13:00
Sam Minnee
7ea151789b MINOR: Formatted code a little better, at Stig's request. 2012-03-09 10:04:25 +13:00
Sam Minnee
5800db0239 API CHANGE: Allow for the creation of custom GridField fragments. (#6911) 2012-03-09 10:03:53 +13:00
Sam Minnee
c80e86f430 BUGFIX: Fix GridField::Field() 2012-03-09 09:58:57 +13:00
Ingo Schommer
e4a6dd5850 Merge branch 'integration' 
Conflicts:
	forms/gridfield/GridField.php
 2012-03-08 20:25:21 +01:00
Ingo Schommer
ae17e97d75 MINOR Made GridFieldPopupForms work outside of the CMS again (was assuming existence of Breadcrumbs) 2012-03-08 19:53:19 +01:00
Ingo Schommer
b321b9b995 MINOR Don't show GridField pagination when no records are found, and ensure the "no results" message is laid out correctly 2012-03-08 18:22:30 +01:00
Ingo Schommer
2ec40f888a MINOR Stop using deprecated FormField->getTabIndex() 2012-03-08 18:22:27 +01:00
Ingo Schommer
ac20bfaf99 MINOR Renamed GridFieldAction_Edit to GridFieldEditAction, GridFieldAction_Delete to GridFieldDeleteAction, to make it clearer that there's no parent class/concept called "GridFieldAction". There's only the GridFieldActionProvider interface, as well as the GridField_FormAction (which is a related, but different kettle of fish). 2012-03-08 18:22:25 +01:00
Ingo Schommer
3e700d729f MINOR Renaming GridField_Action to GridField_FormAction, to better distinguish it from GridFieldActionProvider and GridFieldAction_Edit. The two are conceptually related, but not through inheritance, as the original naming suggested. 2012-03-08 15:22:00 +01:00
Normann Lou
d35d7507ff FEATURE SSF-25 : enable to remove component from a GridFieldConfig. 2012-03-08 20:29:18 +13:00
Normann Lou
fd828fc4cb ENHANCEMENT SSF-53 : change the icon class for "Link Existing" button to 'chain--plus' 2012-03-08 14:55:53 +13:00
Andrew O'Neil
38db2c1744 BUGFIX: Fix state of gridfield pagination 2012-03-08 14:11:25 +13:00
Normann Lou
0ede949b74 MINOR SSF-53 : typo correction 'unlick' => 'unlink' 2012-03-08 12:28:35 +13:00
Normann Lou
7331a06cb1 ENHANCEMENT SSF-53 : add gridfield-button-unlink to unlink button that removes a member from a group 2012-03-08 11:05:57 +13:00
Julian Seidenberg
a59637c77c MINOR: SSF-30 tweaking comment 2012-03-08 10:08:43 +13:00
Sam Minnee
1fd8d19e28 API CHANGE: FormAction::FieldHolder() now returns just the Field(), so that a FieldList::forTemplate() returns a sensible result for an action list. 2012-03-08 10:02:57 +13:00
Sam Minnee
e4dbf8065b API CHANGE: Added FieldList::forTemplate(), so that by default a FieldList will be rendered in its template as a concatenation of FieldHolder values. 
API CHANGE: Removed unnecessary HiddenFieldList class.
 2012-03-08 10:00:54 +13:00
Ingo Schommer
391ffde4f3 API CHANGE Deprecated FormField->getTabIndex()/setTabIndex(), use getAttribute()/setAttribute() instead. Removed FormField->getTabIndexHTML() 2012-03-07 17:46:10 +01:00
Ingo Schommer
3b9c9399dc MINOR Using base LeftAndMain_EditForm template in GridFieldPopupForms regardless of template overrides on the "root" cms controller 2012-03-07 17:17:44 +01:00
Ingo Schommer
feca8390d7 API CHANGE Deprecated HasManyComplexTableField and ManyManyComplexTableField, use GridField with GridFieldConfig_RelationEditor instead 2012-03-07 13:32:42 +01:00
Ingo Schommer
55a0fb18e4 API CHANGE Deprecated FormField->describe(), use setDescription() instead. Actually use the description in form fields other than FormAction. 2012-03-07 13:32:42 +01:00
Ingo Schommer
69a8659a3d ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field 2012-03-07 13:32:42 +01:00
Normann Lou
1facb509a4 ENHANCEMENT SSF-53 : Change the Labels for "Save" and "Delete" button for an "adding new form" of GridField to "Create" and "Cancel", apply different logic for Cancel 2012-03-07 18:32:27 +13:00
Julian Seidenberg
febcff734c BUGFIX: SSF-30 redirect action that sends an edit form back to the root of assets after making a change like changing the parentID of a file, or deleting it. Basically, any action that makes the existing URL reference obsolete. 2012-03-07 17:17:32 +13:00
Julian Seidenberg
676bcbe8c0 BUGFIX: SSF-30 adding check for null record in the GridFieldPopupForms request handler 2012-03-07 16:43:12 +13:00
Julian Seidenberg
5967a1c135 API-CHANGE: SSF-30 adding a method to control a parameter passed to Hierarchy->getChildrenAsUL() from TreeDropdownField. The parameter is useful for controlling whether the returned UL contains child nodes, or just folders. 2012-03-07 16:43:12 +13:00
Normann Lou
4794195b25 MINOR SSF-53 : change the export button's icon name as per design 2012-03-07 15:28:00 +13:00
Andrew O'Neil
a28485316f BUGFIX: Fix pagination when there are no records 2012-03-07 14:48:08 +13:00
Andrew O'Neil
c81bb3b4d3 MINOR: Change -10/+10 buttons to First and Last 2012-03-07 14:48:08 +13:00
Ingo Schommer
829c7682e3 BUGFIX Support for multilevel nested GridFieldPopupForm (in CMS only), fixed breadcrumb linkage 2012-03-07 01:23:41 +01:00
Ingo Schommer
b43bdf3781 BUGFIX Allowing to save ListboxField and CheckboxSetField into custom relations (which don't return TRUE for has_many() or many_many()) 2012-03-07 01:23:41 +01:00
Andrew O'Neil
58309cb2ec MINOR: Tests for add and edit forms of GridField 2012-03-07 10:48:09 +13:00
Ingo Schommer
8efaf75375 MINOR jQuery UI icons for GridField buttons (with spriting), added new icon to GridFieldRelationDelete to dustinguish it visually from GridFieldAction_Delete 2012-03-06 21:38:34 +01:00
Ingo Schommer
1c344db339 MINOR More consistent overloading in GridField_Action, using standard getAttributes() method rather than custom template placeholders, removing setButtonIcon() and setButtonLabel() as those features already exist in the base implementation 2012-03-06 21:38:34 +01:00
Ingo Schommer
0b4228231c MINOR Integrating GridFieldSearch.js in GridField.js (and using entwine for it) 2012-03-06 21:38:34 +01:00
Ingo Schommer
dc83ace928 BUGFIX Fixed CSV exporting on GridFieldExporter (was calling action via ajax, which doesn't allow HTTP download responses) 2012-03-06 15:50:07 +01:00
Ingo Schommer
dca1b0df1c MINOR GridField docs 2012-03-06 12:39:13 +01:00
Julian Seidenberg
17016273d5 MINOR: SSF-106 documentation 2012-03-06 15:01:17 +13:00
Ingo Schommer
4253950b4c MINOR Fixed handleRequest() usage in GridFieldPopupForms 2012-03-06 01:23:34 +01:00
Ingo Schommer
1201f6c8bb BUGFIX Saving records in ListboxField->saveInto() and PermissionCheckboxSetField->saveInto() so we have a database ID to relate to (was previously customised in MemberTableField->saveComplexTableField(), which is now deprecated) 2012-03-06 01:23:34 +01:00
Julian Seidenberg
e0bd5d1070 ENHANCEMENT: SSF-106 adding a "no items found" message when returning an empty grid field 2012-03-06 12:36:59 +13:00
Julian Seidenberg
a715785a42 ENHANCEMENT: SSF-106 adding the ability to turn off and on the "add new" button on the GridFieldTitle 2012-03-06 11:19:46 +13:00
Hamish Friedlander
763e644145 BUGFIX: Dont need (and cant call) iteratorProperties calls as workaround any more 2012-03-06 10:18:26 +13:00
Hamish Friedlander
28bb83552a API-CHANGE: moving iterator support from ViewableData to SSViewer. New set of unit tests for iterator support functions. 2012-03-06 09:31:55 +13:00
Ingo Schommer
e2c21cce8e MINOR "New <record title>" breadcrumb for GridFieldPopupForm 2012-03-05 18:21:08 +01:00
Ingo Schommer
8da89c6f7c MINOR Generic .cms-help-toggle implementation to replace MemberDatetimeOptionsetField.js (which also didn't work when loaded via Ajax, and needed a rewrite to jQuery.entwine anyway) 2012-03-05 17:41:50 +01:00
Ingo Schommer
40abab8aec ENHANCEMENT GridFieldPopupForms->setValidator() 2012-03-05 17:41:50 +01:00
Ingo Schommer
8a4a6efe29 MINOR Moving CMS-specific customisations to GridFieldPopupForms into form getter, so it also applies when the form has validation errors 2012-03-05 17:41:50 +01:00
Ingo Schommer
5d565dcfa3 ENHANCEMENT Added ListboxField->setDisabledItems() and setDefaultItems() (similar to CheckboxSetField API) 2012-03-05 16:11:29 +01:00
Ingo Schommer
ea31e1798a MINOR Don't duplicate pagination defaults from GridFieldPaginator in GridFieldConfig 2012-03-05 16:11:29 +01:00
Ingo Schommer
6798d40709 MINOR GridField documentation 2012-03-05 12:27:25 +01:00
Ingo Schommer
10a85f4bab ENHANCEMENT Scaffolding GridFieldRelationAdd->searchFields if required, making constructor argument optional 2012-03-05 12:27:00 +01:00
Ingo Schommer
0762be9927 ENHANCEMENT Renamed GridFieldConfig_ManyManyEditor to GridFieldConfig_RelationEditor, to be more in line with underlying component naming, and more accurate (as it allows editing has_many relations as well). Removed $fieldToSearch argument from its constructor to keep config API consistent, should use getComponentByType() for configuration. Added GridFieldConfig_RecordEditor 2012-03-05 12:26:02 +01:00
Ingo Schommer
375ad464db ENHANCEMENT GridFieldPaginatior->itemsPerPage accessors 2012-03-05 12:12:36 +01:00
Ingo Schommer
344899ab77 Revert "ENHANCEMENT Support numeric array values in CheckboxSetField (?Field[]=val1&Field[]=val2 instead of ?Field[val1]=1&Field[val2]=1)" - data handling with numeric/associative arrays too clumsy, fixed up ListboxField instead 
This reverts commit 8fa266462f.
 2012-03-05 10:55:44 +01:00
Ingo Schommer
6e3ceefbb8 ENHANCEMENT Relationship saving in ListboxField (preparing for chosen.js usage), escaping commas in payload when serialising multiple values into a single field 2012-03-05 10:55:09 +01:00
Normann Lou
7a97b52a2e ENHANCEMENT SSF-53 : add customised icon class for relational 'Export to CSV' button. 2012-03-05 17:30:02 +13:00
Normann Lou
8a56f989ac MINOR SSF-53 : give "Add New" button an 'add' icon class, give "Link Exisiting" button a 'linkexisting' class 2012-03-05 15:47:36 +13:00
Normann Lou
d26e68c41a ENHANCEMENT SSF-53 : add customised icon class for relational 'Find' button and 'Link Existing' button 2012-03-05 15:47:35 +13:00
Normann Lou
3ef957b704 APICHANGE SSF-53 : add ability to set an customised class of icons for a GridField_Action button 2012-03-05 15:47:35 +13:00
Andrew O'Neil
929182f818 MINOR Adjust pagination to match design 2012-03-05 15:28:40 +13:00
Sam Minnee
adfdd068e2 Merge branch 'ereg-to-preg' of https://github.com/AngryPHPNerd/sapphire 
Conflicts:
	model/fieldtypes/Date.php
 2012-03-05 13:54:20 +13:00
Normann Lou
79d52a2382 ENHANCEMENT SSF-53: put a unlink button in the "Actions" column rather than holding a separate column for easy styling 2012-03-05 12:45:05 +13:00
Sean Harvey
b3d977f0e7 Merge remote-tracking branch 'upstream/master' into file_shortcodes 2012-03-03 10:24:06 +13:00
Ingo Schommer
299bf8b9c6 Merge branch 'integration' 2012-03-02 20:53:06 +01:00
Ingo Schommer
8fa266462f ENHANCEMENT Support numeric array values in CheckboxSetField (?Field[]=val1&Field[]=val2 instead of ?Field[val1]=1&Field[val2]=1) 2012-03-02 20:46:22 +01:00
Ingo Schommer
b95abeedc6 Revert "MINOR SSF-53 : add ability to add customised class to GridField table" (introduces duplicate '.ss-gridfield' class in different levels of the DOM hierarchy) 
This reverts commit 7bdc3d13fc.
 2012-03-02 12:28:45 +01:00
Ingo Schommer
783de154b2 MINOR Declaring JS requirements for AjaxUniqueTextField 2012-03-02 11:06:40 +01:00
Normann Lou
1175c693c5 ENHANCEMENT SSF-53 : add ability to use translated button label for 'Add New' and 'Link Existing' 2012-03-02 17:26:36 +13:00
Normann Lou
7bdc3d13fc MINOR SSF-53 : add ability to add customised class to GridField table 2012-03-02 16:27:34 +13:00
Normann Lou
5548c66a49 ENHANCEMENT SSF-53 reordering the components that added to group GridField in CMS so that it appears same as the landing view of SecurityAdmin 2012-03-02 16:03:23 +13:00
Normann Lou
de75798559 BUGFIX SSF-53 Pass through the parameter $itemsPerPage instead of reassign the default value (15) 2012-03-02 15:59:39 +13:00
Andrew O'Neil
fce5487e59 MINOR: SFF-106 Gridfield changes to make styling easier 2012-03-02 11:06:24 +13:00
Ingo Schommer
aa2e610a20 MINOR Documentation 2012-03-01 21:36:01 +01:00
Ingo Schommer
04698ac295 ENHANCEMENT GridFieldRelationAdd->placeholderText (SSF-53) 2012-03-01 21:35:59 +01:00
Ingo Schommer
a2afe4e4ad ENHANCEMENT Support multiple search fields in GridFieldRelationAdd, and allowing custom result formatting (SSF-53) 2012-03-01 21:35:45 +01:00
Ingo Schommer
9c95a9ae29 MINOR Removed GridFieldRelationAdd->useAutoSuggestion flag, as the field doesn't work without it (no current ID is being set via JS) (SSF-53) 2012-03-01 17:57:16 +01:00
Ingo Schommer
f8201c48a3 MINOR More generic CSS styles for .cms-file-info: Apply to form.small parent, fixed related UploadField spacing issues 2012-03-01 11:58:16 +01:00
Sean Harvey
f5c4bc0802 ENHANCEMENT Ensure that broken File links receive an "ss-broken" class, just like broken SiteTree links 2012-03-01 23:24:58 +13:00
Sean Harvey
898c8f5497 ENHANCEMENT [file_link id=n] shortcode support for file links in HtmlEditorField 2012-03-01 22:20:58 +13:00
Normann Lou
2dfb4142e0 BUGFIX SSF-53: fixed that raw html source appears for "Export to CSV" button(SSF-243) 2012-03-01 12:35:35 +13:00
Andrew O'Neil
a50fc5180a MINOR: SSF-106 Dont hide filter buttons when search isnt selected 2012-03-01 10:59:29 +13:00
Ingo Schommer
586ca7374f Merge pull request #202 from halkyon/date_changes 
Date changes
 2012-02-29 13:02:30 -08:00
Ingo Schommer
da879da940 MINOR Styling and structural fixes for File/Image->getCMSFields() and relates usage in UploadField/HTMLEditorField. 2012-02-29 21:06:43 +01:00
Ingo Schommer
b92676cc86 MINOR Fixed DatetimeField_Readonly config retrieval 2012-02-29 16:59:07 +01:00
Ingo Schommer
726b9cac46 MINOR Create valid HTML attributes in GridFieldDefaultColumns->getColumnAttributes() 2012-02-29 09:53:22 +01:00
Felipe Skroski
bc6ea2ec0e MINOR: (SSF-106) started on styling the filter bar on the datagrid 2012-02-29 16:42:57 +13:00
Andrew O'Neil
2dffac7398 MINOR: SSF-106 Add classes for gridfield buttons 2012-02-29 14:59:11 +13:00
Andrew O'Neil
98f047ebfa MINOR: Add asc and desc classes to sorted header 2012-02-29 14:37:48 +13:00
Ingo Schommer
804e2daa71 ENHANCEMENT Breadcrumbs support in GridFieldPopupForms (CMS only) 2012-02-28 18:48:33 +01:00
Ingo Schommer
25d0196b04 MINOR Merge errors 2012-02-28 18:09:30 +01:00
Ingo Schommer
bcc73de85e Merge branch '106-add-edit-records-rc' 
Conflicts:
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/_style.scss
	admin/templates/Includes/LeftAndMain_EditForm.ss
	css/GridField.css
	filesystem/Folder.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldDefaultColumns.php
	forms/gridfield/GridFieldPopupForms.php
 2012-02-27 23:58:10 +01:00
Ingo Schommer
f1775b5f84 MINOR Backlinks in CMS edit form template, first defined in GridFieldPopupForms 2012-02-27 23:52:49 +01:00
Ingo Schommer
8ff8d32764 MINOR Adding GridFieldPopupForms to default GridFieldConfig_ManyManyEditor settings 2012-02-27 23:52:49 +01:00
Ingo Schommer
cbfd76dd36 MINOR Documentation 2012-02-27 23:52:49 +01:00
Ingo Schommer
3b53ed1937 MINOR Moved some CMS-specific template config into GridFieldPopupForms, to make the external API easier to use, and make specific configs less dependent on the instanciation context, and more tuned to the actual execution controller context 2012-02-27 23:52:48 +01:00
Ingo Schommer
ba0d1c60cb MINOR Don't require controller on instanciation of GridFieldPopupForms, as it can't be reliably determined e.g. during a getCMSFields() call. Should use existing FormField/Form API to retrieve controller when its required. 
MINOR Renamed GridFieldPopupForms->popupFormName to $name to make it clearer that its the component name (which is optional now).
 2012-02-27 23:52:48 +01:00
Julian Seidenberg
3936909980 ENHANCEMENT: working delete button 2012-02-27 23:52:48 +01:00
Julian Seidenberg
550f75408e ENHANCEMENT: File and Image CMSFields styling 2012-02-27 23:52:40 +01:00
AngryPHPNerd
0e2cbb0b88 Replace ereg with preg_* 2012-02-27 22:14:02 +01:00
Sean Harvey
f4a758e500 BUGFIX DatetimeField allows non-US style dates with an empty time component to be saved correctly 2012-02-24 20:52:26 +13:00
Ingo Schommer
3b72f598a2 MINOR Added CSS class for identifying column in GridFieldDefaultColumns 2012-02-23 23:29:58 +01:00
Ingo Schommer
0bc6bffa9b BUGFIX Changed CSS class structure of GridField to avoid duplication of ".ss-gridfield" selector in different contexts, and make selectors less verbose (no more "fieldset.ss-gridfield"). Added "field" class to GridField container to ensure it displays correctly alongside other form fields (mainly around margins and paddings) 2012-02-23 23:29:58 +01:00
Ingo Schommer
9df1487d8f ENHANCEMENT Allow to batch-add components via GridFieldConfig->addComponents() 2012-02-23 23:29:57 +01:00
Ingo Schommer
abedf2a4a9 ENHANCEMENT Confirming deletion of records in GridField via JavaScript alert 2012-02-23 23:29:55 +01:00
Ingo Schommer
cbc2891c80 MINOR Metadata for GridField and Folder->getCMSFields() to allow opening folder references in the UI 2012-02-23 18:39:42 +01:00
Felipe Skroski
1ebd83df1a ENHANCEMENT: styled the header of the datagrid (SSF-106) 2012-02-22 16:29:37 +13:00
Andrew O'Neil
b389138f50 MINOR Move gridfield actions HTML to templates 2012-02-22 16:19:45 +13:00
Andrew O'Neil
0acaf39664 FEATURE "Add" for gridfield 2012-02-20 14:50:53 +13:00
Ingo Schommer
abfa16fa70 ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
Ingo Schommer
e28afcacc5 MINOR Added FormAction->setUseButtonTag() and getUseButtonTag() 2012-02-17 13:35:54 +01:00
Ingo Schommer
ad8fe82b37 MINOR Added FormField->getDescription() to complement FormField->describe() 2012-02-17 13:35:54 +01:00
Ingo Schommer
454b89f2bb BUGFIX Fixed FormAction.ss template when used with <button> tag 2012-02-17 13:35:54 +01:00
Ingo Schommer
a196135089 API CHANGE Replace jQuery.metadata in DateField markup with HTML5 data attributes 2012-02-17 13:35:54 +01:00
Ingo Schommer
9190bc4893 ENHANCEMENT Support for <legend> tags in CompositeField 2012-02-17 13:35:53 +01:00
Ingo Schommer
b417daf7af ENHANCEMENT Custom tags for CompositeField, which allows for nesting <fieldset> elements (not possible through the toplevel-only FieldList/FieldSet class) 2012-02-17 13:35:53 +01:00
Ingo Schommer
7602d081a2 ENHANCEMENT Fluent interface in Form API by returning instance from all setters 2012-02-17 13:35:26 +01:00
Ingo Schommer
5911abc0f6 API CHANGE Removed prototype.js style $() alias usage for document.getElementById() to avoid confusion with the more common jQuery() alias. 
API CHANGE Removed several unsed JavaScript globals: sprintf(), Number.prototype.CURRENCIES, Number.prototype.toCurrency(), String.prototype.ucfirst(), jQuery.fn.clearFields(), jQuery.fn.clearInputs()
MINOR Removed prototype_improvements.js and jquery_improvements.js files, now contained in individual component code (or removed altogether)
 2012-02-16 12:27:47 +01:00
Ingo Schommer
5220a46fd0 ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer. 2012-02-14 13:53:35 +01:00
Ingo Schommer
c422e06b60 MINOR Removed GridField->requireDefaultCSS() idiom, not used elsewhere (or used for JS in the same class), should be handled through Requirements class instead 2012-02-14 13:53:32 +01:00
Ingo Schommer
3866f561f5 ENHANCEMENT Using GridField for file selection in "insert image" dialog 
API CHANGE Combined HTMLEditorField_Toolbar->FlashForm() and ImageForm() into new MediaForm() to handle both file types
 2012-02-14 13:30:52 +01:00
Ingo Schommer
1b42b2afa7 MINOR GridField JS API for updating state 2012-02-14 13:30:51 +01:00
Ingo Schommer
47ac047454 MINOR Setting existing GridState from client during request handling to allow altering it there 
MINOR Parameter namespacing for GridState to avoid clashes with multiple GridField instances in same form
MINOR GridField->index() to render the field, unify with gridFieldAlterAction() to support state changes
 2012-02-14 13:30:51 +01:00
Normann Lou
18e5dec680 MINOR Add forceFullTree param for getting a complete tree (SSF-110) 2012-02-13 09:53:00 +01:00
Fred Condo
d370423825 Clean up trailing ?> per coding standard 
All sapphire but the lang directory
 2012-02-12 12:40:16 -08:00
Will Rossiter
37156b0270 BUGFIX: avoid error accessing Tab ID if TabSet has not been set 2012-02-11 14:01:43 +13:00
Ingo Schommer
5bf79f8146 BUGFIX Removed tinymce-advcode plugin which breaks with new TinyMCE and newer browsers. Both the plugin and the underlying 'codepress' engine are unmaintained. Fall back to standard (non-highlighted) TinyMCE <textarea> editing (fixes #6779) 2012-02-11 01:08:04 +01:00
Ingo Schommer
243d4d45aa MINOR Restored row/col defaults in TextareaField and HtmlEditorField (broken in 1a10e8bc) 2012-02-10 12:15:41 +01:00
Andrew O'Neil
38bce79fc6 FEATURE Add title component 2012-02-09 16:02:47 +13:00
Andrew O'Neil
23af60633c BUGFIX Fix edit and delete actions on gridfield 2012-02-09 14:35:33 +13:00
Andrew O'Neil
a76c9c3c5e BUGFIX Fix checkFieldsForAction() when working with tabs 2012-02-09 11:46:33 +13:00
Ingo Schommer
448c5fd7b9 Merge branch 'story/SSF-28' 2012-02-08 15:35:34 +01:00
Ingo Schommer
c00f0406e9 ENHANCEMENT Attaching files from /assets through UploadField 2012-02-08 15:34:41 +01:00
Ingo Schommer
a0d583291c MINOR Fixed UploadField->managesRelation() when no record is set 2012-02-08 11:27:10 +01:00
Ingo Schommer
5a3242cab7 MINOR Allowing custom attributes on GridField, adding more CSS classes to support behaviour 2012-02-08 01:04:56 +01:00
Ingo Schommer
1b4dda491a MINOR Moving File->OwnerID setting to model layer 2012-02-08 01:04:56 +01:00
Ingo Schommer
7718c75e3a MINOR Removed detection of has_one relationships in UploadField when using the database column name rather than relationship name - too verbose, and not supported by underlying FileField. 2012-02-08 01:04:56 +01:00
Andrew O'Neil
df716eff45 ENHANCEMENT Allow multiple column providers for a single column 2012-02-08 11:21:34 +13:00
Ingo Schommer
9c0a606abf API CHANGE Deprecated SimpleImageField, use FileField or UploadField with setAllowedExtensions() 2012-02-03 01:00:11 +01:00
Ingo Schommer
c0d187071a ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
Ingo Schommer
b8cc2085b6 API CHANGE Deprecated FileIframeField and ImageField, use UploadField instead 2012-02-03 00:59:04 +01:00
Ingo Schommer
ca047b64b8 MINOR Removed usage of HiddenFieldSet 2012-02-03 00:46:49 +01:00
Stig Lindqvist
c2c0e1b4b6 Merge pull request #173 from chillu/gridfield-config-getcomponents 
GridFieldConfig->getComponentsByType() and "default config" change
 2012-01-30 19:29:23 -08:00
Ingo Schommer
bb5385db3e Merge pull request #175 from silverstripe-scienceninjas/pull/autosuggestion-class-fix 
BUGFIX It's not possible to use more than one autosuggestion field from GridFieldRelationAdd per view
 2012-01-30 14:29:58 -08:00
Ingo Schommer
a135b7c01d MINOR Removed GridField->getDefaultConfig() in favour of new GridFieldConfig_Base class (and adjusted its components to remove the "edit" component, and add the "filter" component by default, to match the original getDefaultDefaultConfig()) 2012-01-30 15:51:07 +01:00
Ingo Schommer
5fe86be311 ENHANCEMENT Added GridFieldConfig->getComponentsByType() and getComponentByType() 2012-01-30 15:47:26 +01:00
Sam Minnee
2d898cab63 API CHANGE: Added GridFieldExporter, a GridField component that adds export functionality, and added it to the security admin. 2012-01-30 19:49:10 +13:00
Russell Michell
0090009703 BUGFIX: Added default args to GridFieldPopupForms for AssetAdmin which was casing errors 
BUGFIX: Added GridFieldFilter() to new GridFieldConfig whuch adds filters and fixes the display
MINOR: Added gridfield specific margins to form div to push GridField display down-page (due to GF's sort-fields which will be refactored from new designs)
 2012-01-30 09:26:39 +13:00
Stig Lindqvist
9b3af77637 BUGFIX It is not possible to use more than one autosuggestion field from GridFieldRelationAdd per view 2012-01-24 19:15:24 +01:00
Ingo Schommer
008ecf750a MINOR Fixed GridFieldExporter accessors (undefined $gridField in changed scope) 2012-01-30 17:29:35 +01:00
Ingo Schommer
5faca9ca2f MINOR Accessors, documentation and i18n for GridFieldExporter 2012-01-30 16:48:15 +01:00
Stig Lindqvist
28906d4b32 MINOR i18n on GridFieldRelationAdd, GridFieldFilter and GridFieldItemEditVIew template 2012-01-24 19:13:12 +01:00
Stig Lindqvist
439ed75ff9 MINOR Removed unused property on GridFieldFilter 2012-01-24 02:46:12 +01:00
Stig Lindqvist
07029138bf MINOR Updated docblocks for GridFieldPaginator 2012-01-24 02:46:12 +01:00
Stig Lindqvist
ed889529b4 API CHANGE Added two predefined GridFieldConfigs and removal of unsused accessors 
- GridFieldConfig_ManyManyEditor for default relationship list managment
- GridFieldConfig_Base for basic list managment
 2012-01-24 02:46:12 +01:00
Stig Lindqvist
c396c2d2ae API CHANGE Security admin supports adding, removing and searching for members by relations via gridfield 
This contains some experimental API's when using GridFieldPopupForms on GridFieldPopupForms.

- GridFieldRelationAdd
- GridFieldRelationDelete
 2012-01-24 02:46:07 +01:00
Ingo Schommer
cb74dbccfc MINOR Removed overzealous value validation in ListboxField, should silently ignore unknown values (lacking better referential integrity measures in the underlying model layer) 2012-01-19 12:13:18 +01:00
Sam Minnee
c0d891cc0b BUGFIX: Fixed GridField::getModelClass() not to access protected property. 2012-01-10 16:59:28 +13:00
Sam Minnee
6a08a82c9c MINOR: Removed notice-level errors from form field construction. 2012-01-10 16:58:27 +13:00
Sam Minnee
7c6050b407 Merge remote-tracking branch 'refs/remotes/chillu/formfield-constructors' 
Conflicts:
	forms/CountryDropdownField.php
 2012-01-10 16:41:02 +13:00
Sam Minnee
489191b44f BUGFIX: Fixed notice-level errors in GridField, exposed by test failures. 2012-01-10 16:39:12 +13:00
Sam Minnee
88f645ef59 Merge remote-tracking branch 'refs/remotes/scienceninjas/pull/gridfield-tests' 2012-01-10 16:02:06 +13:00
Russell Michell
e2661dfac1 MINOR: Fixes for IE<8 2012-01-10 13:05:20 +13:00
Ingo Schommer
a06300f0b4 ENHANCEMENT GridFieldItemEditView (and specific view and behaviour for usage in CMS) 2012-01-09 21:17:56 +01:00
Ingo Schommer
c82bae1def BUGFIX Prepopulating relation list in FormScaffolder 2012-01-09 21:17:55 +01:00
Ingo Schommer
b01b9b9249 MINOR Removed button styling for GridField, as its preliminary and doesn't apply to any action other than "delete" 2012-01-09 21:17:55 +01:00
Ingo Schommer
24a37daa50 MINOR Added GridFieldAction_Delete 2012-01-09 11:37:13 +01:00
Ingo Schommer
d4bde47944 BUGFIX Fixed GridField->setFieldFormatting() 2012-01-09 11:36:50 +01:00
Sam Minnée
ce795b6d8a Merge pull request #154 from silverstripe-scienceninjas/pull/gridfield-bugfixes 
BUGFIX GridField_Actions did not work in more complex Forms with tabsets...
 2012-01-08 21:52:35 -08:00
Sam Minnee
cb13299cf9 API CHANGE: Added GridField_URLHandler component interface. 2012-01-09 18:47:31 +13:00
Stig Lindqvist
39372497df BUGFIX GridField_Actions did not work in more complex Forms with tabsets (i.e SecurityAdmin) when using GridField_Action 
BUGFIX Empty GridState data causes isset error
BUGFIX Last field of GridFieldFilter outputs wrong label
 2012-01-09 18:41:23 +13:00
Sam Minnee
740f5014b2 MINOR: Added documentation for the grid field, including information on how to extend it. 2012-01-09 17:39:18 +13:00
Stig Lindqvist
3c516b7b97 API CHANGE: Refactored GridField modifiers into GridField_ColumnProvider, GridField_HTMLProvider, GridField_ActionProvider, and GridField_DataModifier interfaces, all added as components in the config. 
API CHANGE: Simplified state handling so that it's just a key store. Affectors are replaced with GridField_ActionProviders. API CHANGE: Removed GridField state manipulation actions instead opting for GridField_ActionProvider actions.
API CHANGE: Removed support for modifiers that add "body" rows, instead having core support for generating the body rows hardcoded into the GridField.
API CHANGE: Allow modification of columns across the whole GridField with the GridField_ColumnProvider interface.
API CHANGE: Renamed GridField_AlterAction to GridField_Action, and added actionName/args parameters, since it can be used for all actions (including batch actions and row actions)
API CHANGE: Removed GridFieldRow class.
 2012-01-09 13:30:34 +13:00
Stig Lindqvist
09bfe93c50 MINOR Updated the docblocks for GridField 2012-01-07 05:18:00 +01:00
Stig Lindqvist
ea4b9fe939 MINOR Added tests for GridField with minor changes to support them 
MINOR Added docblocks
 2012-01-07 04:59:34 +01:00
Ingo Schommer
5ec6aa532c ENHANCEMENT GZipped/combined file loading for TinyMCE, which reduces number of HTTP requests in the standard CMS by a third (and decreases file size due to loading pre-compressed files by default) 2012-01-06 15:34:32 +01:00
Ingo Schommer
095602b958 MINOR TreeDropdownField->setShowInSearch() 2012-01-05 23:17:55 +01:00
Ingo Schommer
98852677d5 ENHANCEMENT Simplified "insert link" interface and logic by reverting to TinyMCE's standard behaviour: Only allow linking on an existing selection, don't allow modifying the link content in the "insert" interface. Now that we're presenting this interface as a dialog rather than persistent sidebar its no longer necessary to have "unselected link creation+insertion". 2012-01-05 00:41:41 +01:00
Ingo Schommer
b5c739e71d ENHANCEMENT Refactored TinyMCE LinkForm from behaviour.js to jQuery.entwine. Fixed clearing of fields when popup is closed. 2012-01-05 00:41:41 +01:00
Ingo Schommer
e4d65ab01b MINOR Adding step indicators to "insert link" dialog 2012-01-03 23:01:05 +01:00
Ingo Schommer
b4b6e5a2db MINOR Cleaned up CMS dialog styling (now works with/without tabs, in iframe and inline markup), removed superfluous SCSS variable declarations 2012-01-03 18:11:21 +01:00
Ingo Schommer
0cf6421afe MINOR Button styling for "insert" dialogs 2012-01-03 09:38:42 +01:00
Ingo Schommer
c0fddf262c MINOR Fixed regression on missing return value in CompositeField->FieldHolder() 2012-01-02 21:32:13 +01:00
Sean Harvey
3d8079c1b5 API CHANGE Removed GeoIP functionality from sapphire. This now belongs in a separate "silverstripe-geoip" GitHub repository: https://github.com/silverstripe-labs/silverstripe-geoip 2012-01-02 18:00:36 +01:00
Ingo Schommer
cc32957414 API CHANGE Don't allow specifying $form as constructor argument in various form fields, use setForm() instead (to achieve a cleaner API with less confusing parameter order) 2012-01-02 17:50:34 +01:00
Ingo Schommer
3c5c04cd75 API CHANGE Removed $maxlength constructor argument from PasswordField, use setMaxlength() instead 2012-01-02 17:45:47 +01:00
Ingo Schommer
27ec98cfce API CHANGE Removed $rightTitle and $folderName constructor arguments for FileField and SimpleImageField, use setRightTitle() and setFolderName() instead 2012-01-02 17:44:28 +01:00
Ingo Schommer
1a10e8bcf5 API CHANGE Removed $rows and $cols constructor arguments on TextareaField and HtmlEditorField, use setRows() and setCols() instead 2012-01-02 17:44:23 +01:00
Ingo Schommer
d678c12ac8 API CHANGE Removed FormAction->extraData() and $extraData constructor argument, use setAttribute() instead 2012-01-02 16:58:46 +01:00
Ingo Schommer
eb5716f471 MINOR Using instanceof rather than is_a in CheckboxSetField 2012-01-02 16:49:33 +01:00
Ingo Schommer
e31851b182 BUGFIX Correctly mark DatetimeField, MoneyField and PhoneNumberField composites as disabled or readonly 2012-01-02 16:49:33 +01:00
Ingo Schommer
72694d8349 ENHANCEMENT Custom form attributes through Form->setAttribute() 2012-01-02 16:49:33 +01:00
Ingo Schommer
b4d7e51da3 API CHANGE Deprecated ImageFormAction, use FormAction with setAttribute('src', 'myimage.png') 2012-01-02 16:48:14 +01:00
Ingo Schommer
d535847f27 MINOR Making $title optional in TreeMultiselectField to comply with parent implementation 2012-01-02 16:48:14 +01:00
Ingo Schommer
b5421d9598 ENHANCEMENT Allowing custom attributes in (most) FormField implementations, which allows for HTML5 data attributes 2012-01-02 16:48:14 +01:00
Ingo Schommer
c77f4e8421 MINOR Allowing usage of FormField->Type() on base implementation 2012-01-02 16:48:14 +01:00
Ingo Schommer
639caea949 MINOR Using FieldList instead of FieldSet on SelectionGroup to comply with parent implementation 2012-01-02 16:48:14 +01:00
Ingo Schommer
475f3764c3 BUGFIX Using separate template for readonly version of Textarea (mainly to avoid SSViewer bugs, but also for more granular customisation) 2012-01-02 16:48:14 +01:00
Ingo Schommer
a6148c33da MERGE Using FormField->template in most fields 2012-01-02 16:48:14 +01:00
Sean Harvey
9e548f501e API CHANGE FormField::Field() and FormField::FieldHolder() now render into templates on each FormField instead of creating HTML from PHP 2012-01-02 16:48:13 +01:00
Ingo Schommer
b3c08dba12 API CHANGE Deprecated FieldSet-specific methods from Form, namely dateFieldByName(), unsetDataFieldByName(), unsetFieldFromTab(), resetField() 2012-01-02 16:47:59 +01:00
ajshort
d692c22ee4 MINOR: Fixed FileField->Value() erroring when files value not set. 2011-12-26 19:08:08 +11:00
ajshort
3478e4f9e6 ENHANCEMENT: Made the form enctype configurable via a method Form->setEncType(). 
API CHANGE: Deprecated Form->FormEncType() in favour of Form->getEncType().
MINOR: Added enctypes as constants to the Form class.
 2011-12-26 18:36:24 +11:00
ajshort
6aa90e6288 MINOR: Replaced is_a with instanceof to fix bugs with the changed is_a behaviour in PHP 5.3.7. 2011-12-26 18:31:32 +11:00
Ingo Schommer
7d245c3803 MINOR Reduced unnecessary autoloading 2011-12-23 10:31:35 +01:00
Ingo Schommer
4d28b79c1b MINOR Reduced HTML validation errors in CMS and FieldGroup 2011-12-18 17:00:01 +01:00
Sam Minnee
70d40cf4df BUGFIX: Removed use of base "Exception" class in order to avoid failures on PHPUnit 3.6. 2011-12-17 11:51:40 +13:00
Ingo Schommer
f2ec8b0d54 BUGFIX Enforcing TinyMCE textarea call on window.load in addition to entwine/DOMReady to ensure TinyMCE.init() has been called and all plugins are loaded. 2011-12-15 00:48:29 +01:00
Ingo Schommer
7e01c40770 MINOR Avoid nesting metadata properties in TreeDropdownField, setting classname in metadata even if no record is pre-selected 2011-10-29 21:56:00 +02:00
Ingo Schommer
96d18efa58 MINOR Replaced calls to deprecated FormField->Name() with getName() 2011-10-29 13:27:11 +02:00
Sam Minnee
ed5f72b055 BUGFIX: Don't use ComplexTableField_Popup.ss to render the form. 2011-10-29 18:07:22 +13:00
Sam Minnee
085598fac0 API CHANGE: Replaced ManyManyList::removeByFilter() with ManyManyList::removeAll(). 2011-10-29 17:36:39 +13:00
Sam Minnee
6a3aac25a7 MINOR: Remove deprecated getCsvQuery() 2011-10-29 17:36:39 +13:00
Sam Minnee
0d683dd8ef MINOR: Removed use of deprecated join() in favour of innerJoin() and leftJoin(). 2011-10-29 17:36:38 +13:00
Sam Minnee
b0b5fea3f5 MINOR: Removed use of deprecated securityTokenEnable. 2011-10-29 17:36:38 +13:00
Sam Minnee
42b8d3da04 MINOR: Use FieldList over deprecated FieldSet 2011-10-29 17:36:38 +13:00
Sam Minnee
22e5617ee2 MINOR: Moved from use of deprecated SQLMap to SS_Map. 2011-10-29 17:36:37 +13:00
Sam Minnee
ff9b9e17af MINOR: Removed use of deprecated Director::redirect* functions. 2011-10-29 17:36:37 +13:00
Sam Minnee
a49b56a348 MINOR: Removed usage of deprecated FormField::Name() 2011-10-29 17:34:32 +13:00
Sam Minnee
e5afa25522 MINOR: Use Deprecation class to indicate deprecated methods in core. 2011-10-29 17:34:31 +13:00
Will Rossiter
01bfdbeb90 MINOR tweaks to SecurityAdmin layout 2011-10-29 15:47:08 +13:00
Stig Lindqvist
83e90aaafe ENHANCEMENT Release of DataGridPagination 
This class extends the DataGridPresenter with the behaviour and looks of a paginated Datagrid.
 2011-10-28 17:34:15 +13:00
Hamish Friedlander
cf408d766a Merge pull request #80 from silverstripe-scienceninjas/release/datagrid-renaming 
API CHANGE: Rename DataGrid to GridField to be more in line with other field class names
 2011-10-27 20:55:30 -07:00
Stig Lindqvist
b229c17e1d ENHANCEMENT Renamed DataGrid to GridField 2011-10-28 16:35:39 +13:00
Stig Lindqvist
e38dd08ea5 MINOR: Fix docblocks to reference SS_List instead of (now deprecated) DataObjectSet where appropriate 2011-10-28 15:58:55 +13:00
Hamish Friedlander
0a3e0f15de MINOR: Replace references to FieldSet (now deprecated) with references to FieldList 2011-10-28 15:58:55 +13:00
Hamish Friedlander
4c0105a3c4 MINOR: Fix deprecated notices - change old references to 2.5 from ORM work to 3.0.0, and use new deprecation notice system 2011-10-28 15:58:55 +13:00
Ingo Schommer
a3bcf0c61c MINOR Using Object::create() for sub fields in DatetimeField to allow changing the dependencies globally 2011-10-07 14:12:51 +02:00
Ingo Schommer
7c147fed14 ENHANCEMENT Passing 'timeformat' and other metadata to markup generated in DateField, TimeField and DatetimeField, to allow for easier integration with third party libraries 2011-10-07 14:12:51 +02:00
Ingo Schommer
b807983d09 API CHANGE Using <div> instead of <p> for CheckboxField->FieldHolder() 2011-10-07 14:12:51 +02:00
Ingo Schommer
d93bd49edc ENHANCEMENT Allowing global default configuration for DateField, TimeField and DatetimeField 2011-10-07 14:12:50 +02:00
Ingo Schommer
585a8bc784 API CHANGE Removed 'showdropdown' option from TimeField, use custom libraries instead 2011-10-07 14:12:50 +02:00
Ingo Schommer
aa60201cd1 MINOR Making date/time order and separation configurable through DatetimeField->setConfig('datetimeorder') 2011-10-07 14:12:50 +02:00
Ingo Schommer
c89bdbb268 ENHANCEMENT Added user timezone support to DatetimeField 2011-10-07 14:12:50 +02:00
Ingo Schommer
f37640b493 BUGFIX Added support for array values in LookupField, to ensure it works correctly when used as a readonly representation of ListboxField (AIR-39) 2011-10-07 14:12:49 +02:00
Ingo Schommer
b438a0a095 API CHANGE Removed support for undocumented and only partially implemented FormField->reserveNL flag, which is just the opposite of the documented and more frequently used FormField->dontEscape flag. 2011-10-07 14:12:49 +02:00
Ingo Schommer
6a98615d18 ENHANCEMENT Supporting values not in $source in LookupField, instead of displaying "(none)" (which makes it useable in DataDifferencer) (AIR-24) 2011-10-07 14:12:48 +02:00
Ingo Schommer
6e1013e93b MINOR Allowing HTML values in SimpleImageField_Readonly in order to allow image-based diffs 2011-10-07 14:12:48 +02:00
Ingo Schommer
4d31ac65a0 ENHANCEMENT Allowing array values in ListboxField->setValue(), serialising into comma-separated list of values (AIR-35) 2011-10-07 14:12:47 +02:00
Ingo Schommer
afeccbc9cb ENHANCEMENT Added File::get_class_for_file_extension() instead of hardcoding it in Folder->constructChild(). Allows for custom classes in files uploaded through core functionality like the Upload and FileField logic. 2011-10-07 14:12:45 +02:00
Ingo Schommer
3bd80dfb87 MINOR Requiring behaviour.js for TimeField, and using document.getElementById() instead of $ function alias in TimeField_dropdown.js 2011-10-07 14:12:45 +02:00