tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 09:59:32 +02:00
Code Issues Projects Releases Wiki Activity
8,479 Commits 29 Branches 517 Tags 147 MiB
7b18d9d0da
Commit Graph

1556 Commits

Author SHA1 Message Date
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
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