Ingo Schommer
14a56c18e9
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
control/Director.php
2013-02-07 21:45:16 +01:00
Ingo Schommer
048f6b19fe
Removed DatetimeField->setDescription() proxying
...
We shouldn't pass it to the child fields since it ends
up showing the description three times in the default
"inline" mode. If the description is required as a hover/focus effect,
it can be set individually on the fields.
2013-02-07 11:41:20 +01:00
Ingo Schommer
083b6b2164
NEW Upload->replaceFile setting
2013-02-05 19:28:24 +01:00
Ingo Schommer
b350ded87c
Fixed DatetimeField formatting (single row, smaller field)
...
Also removed the arbitrary right-floating of fields within a fieldgroup
2013-02-05 12:01:32 +01:00
Ingo Schommer
6c22545639
DatetimeField->setDateField()/setTimeField()
...
Useful e.g. to override the time field with the
"silverstripe/timefield" dropdown
2013-02-05 11:03:19 +01:00
Ingo Schommer
857d8bb8df
FIX Don't escape values on TreeDropdownField readonly views
...
They typically output TreeTitle() which is assumed to be HTML.
2013-02-04 17:15:32 +01:00
Ingo Schommer
634c91c6ff
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
email/Mailer.php
2013-01-30 12:46:24 +01:00
Sam Minnee
9a2ba483df
BUGFIX: Made CSRF-error wording friendlier.
2013-01-29 18:03:49 +01:00
Sam Minnee
47e037e74c
FIX: Removed notice-level error after forms w/ required fields are made readonly.
2013-01-29 18:03:47 +01:00
Nicolaas
84abab2aa8
Update forms/DropdownField.php
...
small fix in comments
2013-01-28 16:51:27 +13:00
Simon Welsh
3439e30ac1
Corrects indentation and line length
2013-01-24 19:56:02 +13:00
Ingo Schommer
37f4d2e21f
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-01-21 11:15:17 +01:00
Ingo Schommer
c11b3918fc
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
core/PaginatedList.php
email/Mailer.php
2013-01-21 11:14:57 +01:00
Ingo Schommer
8717deca82
HTMLEditorField undefined $dimensionsField ( fixes #7494 )
...
Also use fluent API for form field definition to keep field invocations
in one place and thereby reduce these kind of bugs.
2013-01-21 11:11:21 +01:00
Ingo Schommer
5d37d55f35
BUG Form session message clearing regression
...
Regression originally from 729bcc95
, but made visible by 014f541a8
2013-01-21 11:11:21 +01:00
Ingo Schommer
014f541a89
BUG Regression in Form->clearMessage() ( fixes #8186 )
...
See 729bcc9
2013-01-15 14:25:07 +01:00
Andrew Short
16efd7402e
ENHANCEMENT: Add grid field save handler.
2013-01-15 22:41:25 +11:00
Ingo Schommer
80feb8c0b4
Respect displayFields in GridFieldPrintButton
...
Provides more coherent and expected default behaviour
2013-01-15 00:55:24 +01:00
micschk
7f605cfb54
NEW Disable items in DropdownField and GroupedDropdownField
2013-01-11 16:32:20 +01:00
uniun
e020c7be57
BUG doSave() and doDelete() should use translated singular name
2013-01-11 15:50:09 +01:00
Ingo Schommer
42a73715cf
Merge pull request #1051 from uniun/patch-3
...
BUG removeRequiredField() should use array_splice() instead of unset()
2013-01-11 06:45:35 -08:00
Ingo Schommer
9b42dec932
Merge pull request #1072 from sunnysideup/patch-2
...
adding extension hook in GridFieldDetailForm.php
2013-01-11 06:37:27 -08:00
Ingo Schommer
7dda38742e
Merge pull request #1071 from sunnysideup/patch-1
...
Update forms/TextareaField.php: small edit to description of the field
2013-01-11 06:37:01 -08:00
Ingo Schommer
e7e6c45aee
Merge pull request #1082 from sminnee/form-improvements
...
Form improvements
2013-01-11 02:29:14 -08:00
Ingo Schommer
acc616b2ca
Merge pull request #1080 from sminnee/caching-improvements
...
Caching improvements
2013-01-11 02:00:51 -08:00
Ingo Schommer
f3c0669fec
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
_config/uploadfield.yml
css/UploadField.css
forms/UploadField.php
scss/UploadField.scss
templates/UploadField.ss
tests/forms/uploadfield/UploadFieldTest.php
2013-01-11 10:02:39 +01:00
Ingo Schommer
9e82d8e857
Fixed line lengths
2013-01-11 09:59:33 +01:00
Sam Minnee
5b450f7fea
NEW: Added replaceExistingFile setting for UploadField.
...
Sometimes has-one UploadFields can get confused about whether or not there is an existing file that needs deleting. This setting lets you make a more robust has-one UploadField, where any existing file will be replaced. It more closely mimics simple single-file upload fields.
2013-01-11 09:29:06 +01:00
Sam Minnee
cc7318fde4
NEW: Added canAttachExisting config option for UploadField.
...
This is the companion setting to canUpload, letting you control whether existing files from the asset store can be referenced. It's particularly useful when using UploadField on the front-end.
2013-01-11 09:29:02 +01:00
Sam Minnee
2fdd9a3b13
FIX: Allow images attached to UploadFields to be unlinked without File::canEdit() or File::canDelete() permission.
...
Although editing meta-data or deleting permanently would require File editing/deleting permissions, merely linking to a record does not. This change is important for allowing front-end use of UploadField; or, more importantly, use of UploadFile by people without CMS rights.
2013-01-11 09:07:42 +01:00
Ingo Schommer
67c5db3320
NEW Global default config for UploadField
2013-01-11 09:07:42 +01:00
Ingo Schommer
2dfd42795e
NEW Restrict upload abilities in UploadField
...
Conflicts:
css/UploadField.css
templates/UploadField.ss
2013-01-11 09:07:42 +01:00
Ingo Schommer
43601d6010
NEW Global default config for UploadField
2013-01-10 00:15:35 +01:00
Ingo Schommer
9310b8d86d
NEW Restrict upload abilities in UploadField
2013-01-10 00:15:34 +01:00
Ingo Schommer
abfb3c7095
Default TreeDropdownField to TreeTitle
...
Same behaviour as in 2.x. All common elements displayed
in this field (SiteTree, Group, File) have a TreeTitle accessor.
2013-01-08 18:39:31 +01:00
Ingo Schommer
61cc033304
Fluent interface for TreeDropdownField
2013-01-08 18:32:40 +01:00
Ingo Schommer
79997477b3
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
model/DataList.php
2013-01-08 17:16:09 +01:00
Hamish Friedlander
2916f2043c
NEW: Improve HTTP caching logic to automatically disable caching for requests that use the session.
...
This improvement makes it easier to set a side-wide default cache time without needing to worry about CSRF-protected forms, etc.
2013-01-08 17:47:05 +13:00
Sam Minnee
729bcc95db
BUGFIX: Don't clear form messages unless forTemplate() is actually called.
...
BUGFIX: Clear session-stored form data as well as form error message.
2013-01-08 17:45:17 +13:00
Sam Minnee
abbee41b78
NEW: Add ReadonlyField::setIncludeHiddenField()
...
The new config setter restores the 2.4 behaviour of including <input type="hidden"> with a field. Although as a default, this option has security flaws; it is useful in a few circumstances and, if nothing else, is handy to make upgrading sites easier.
2013-01-08 17:45:17 +13:00
Sean Harvey
2140a621fb
Merge pull request #1067 from halkyon/shorthand_ternary_op
...
Remove unncessary variable from TreeDropdownField
2013-01-06 17:20:54 -08:00
Sean Harvey
68eb367d27
Remove unncessary variable from TreeDropdownField
2013-01-07 14:14:54 +13:00
Ingo Schommer
06f05d0e7a
Merge pull request #1075 from g4b0/8088-GroupedDropdownField-xhtml-strict-2
...
BUG:removed null FormField value. fixes #8088
2013-01-02 09:02:47 -08:00
g4b0
63dbb1c6c9
BUG:removed null FormField value. fixes #8088
2013-01-02 15:47:06 +01:00
Ingo Schommer
9dafc83f29
Fixed DateField phpdocs
2013-01-02 13:45:15 +01:00
Nicolaas
a32451f72e
adding extension hook in GridFieldDetailForm.php
...
This hook is useful so that you can add additional fields / actions in a gridfield form that are not available in other settings (e.g. additional actions: previous / next / save and publish / unpublish / etc
2012-12-27 19:22:54 +13:00
Justin Martin
f431b35b88
BUG: Confirmed Password Field now copies attributes to child fields.
2012-12-27 09:25:15 +13:00
Nicolaas
3fca288873
Update forms/TextareaField.php
...
small edit to description of the field (usage). Removed reference to cols and rows parameters.
2012-12-26 22:29:36 +13:00
Simon Elvery
775567d427
Allow <button type='submit'> for the benifit of IE<=7
2012-12-21 16:19:43 +01:00
Ingo Schommer
8ec3641e60
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/javascript/LeftAndMain.FieldHelp.js
lang/en.yml
model/URLSegmentFilter.php
2012-12-21 15:04:17 +01:00
Ingo Schommer
661a4a2492
Removed direct sprintf() usage from _t() calls
...
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
2012-12-21 11:46:38 +01:00
Ingo Schommer
7a6ce01567
BUG Skip pagination on UnsavedRelationList in GFPaginator
2012-12-20 20:16:53 +01:00
Nathan J. Brauer
d487a42456
API Default to Upload::$uploads_dir in UploadField
2012-12-20 10:25:52 +01:00
uniun
6aba24b3e9
BUG removeRequiredField() should use array_splice() instead of unset()
...
Function unset() preserves numeric keys and method removeRequiredField() will give a PHP notice about nonexistent array key and loop won't iterate throughout all elements in array on second method call (and all subsequent).
So it's better to use foreach loop and array_splice() function (it doesn't preserve numeric keys).
2012-12-18 11:57:11 +02:00
Ingo Schommer
bbc8e06d49
API Show GridFieldEditButton even without edit permissions (for readonly forms)
2012-12-17 00:47:23 +01:00
Ingo Schommer
1848d7e90a
API Check model permissions in GridField
2012-12-17 00:46:51 +01:00
Ingo Schommer
963f02e7a3
Using new description style in MemberDateTimeOptionSetField
2012-12-14 01:58:04 +01:00
Ingo Schommer
1ca3883a76
NEW Tooltip and inline help text support for CMS form fields
2012-12-14 01:58:04 +01:00
Ingo Schommer
559abecd56
API Copying instance props on FormField readonly/disabled transformations
...
Introduced new FormField->castedCopy() method
which tries to replicate the existing form field instance
as closely as possible.
Primarily, the fix was targeted at consistently passing
through FormField->description to all of its variations.
2012-12-14 01:58:04 +01:00
Ingo Schommer
6f9d01f621
API FormField->setDescription() visible in default template
...
Renders into <span class="description"> instead of "title" attribute
2012-12-14 01:58:04 +01:00
Ingo Schommer
212c427c45
Pass setDescription() through to sub-fields in DatetimeField and PhoneNumberField
2012-12-14 01:57:27 +01:00
Ingo Schommer
26141718ec
BUG Deep cloning for DateTimeField
2012-12-14 01:57:26 +01:00
Ingo Schommer
644cc79ebb
API Removed methods previously deprecated in 3.0
2012-12-14 01:16:47 +01:00
Justin Martin
0f60ca7255
BUG: Confirmed Password Field now copies attributes to child fields.
2012-12-12 14:44:25 +01:00
Simon Welsh
b0121b541c
Add codesniffer that ensures indentation is with tabs.
2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c
Add codesniffer that ensures indentation is with tabs.
2012-12-12 00:12:11 +13:00
Ingo Schommer
548ad503ed
API Removed keyed arrays for title/value setting in SelectionGroup
...
Use SelectionGroup_Item class instead. Necessary because
of removal of array key support from ArrayList (see d12b49702
).
2012-12-11 11:06:06 +01:00
Ingo Schommer
8108f7f936
NEW Relation search for GridFieldAddExistingAutocompleter
...
Now also searches 1:n relations if they where defined in searchableFields() with dot notation.
2012-11-27 10:51:10 +01:00
Ingo Schommer
c8136f5d4c
NEW Many-many relation data editing in GridFieldDetailForm
...
Also adds GridFieldDetailForm->setFields() for customizing
the displayed form fields (required for adding relational fields).
2012-11-27 10:45:43 +01:00
Ingo Schommer
c55c7c33f8
Merge branch '3.0'
...
Conflicts:
admin/code/CMSProfileController.php
composer.json
tests/model/DataObjectTest.php
2012-11-22 23:51:28 +01:00
Ingo Schommer
434759cc83
BUGFIX Correct redirection URL on deletion in GridFieldDetailForm
2012-11-16 15:32:17 +13:00
Ingo Schommer
bd0e597ac6
Use button tag for delete button in GridFieldEditForm
2012-11-16 15:32:17 +13:00
Hamish Friedlander
5edf86fe7a
Merge branch '3.0.3' into 3.0
2012-11-16 14:57:50 +13:00
Hamish Friedlander
7315be4531
FIX default values from DataObject not showing in GridField details form
2012-11-16 12:36:00 +13:00
Hamish Friedlander
0dd97a38f6
API: Form#loadDataFrom 2nd arg now sets how existing field data is merged with new data
2012-11-16 12:36:00 +13:00
Sean Harvey
6a868e79e1
Removing deprecated prototype/behaviour libraries
2012-11-16 11:37:56 +13:00
Sean Harvey
4651e9bbc9
BUG Fixing ToggleField to work correctly with jQuery
2012-11-16 11:33:58 +13:00
Sean Harvey
77337ae58c
Removing deprecated TableListField and subclasses
...
These have been moved to a module called "legacytablefields"
located at https://github.com/silverstripe-labs/legacytablefields
2012-11-16 11:04:28 +13:00
Sean Harvey
aeef4d6e84
Removing deprecated JS from AjaxUniqueTextField
2012-11-16 11:01:14 +13:00
Sean Harvey
8b0bb8dd09
API Replace deprecated FormField::createTag() with static create_tag()
...
GridField uses createTag() which is marked for deprecation, rather
than have it used as the cornerstone of generating FormField templates,
use it as a helper in case fields generate HTML tags from PHP.
2012-11-15 14:43:21 +13:00
Sean Harvey
8c3ecabc31
Removed deprecated ToggleCompositeField::startClosed()
...
Use ToggleCompositeField->setStartClosed() instead
2012-11-15 14:43:21 +13:00
Sean Harvey
4c803a2049
Removed deprecated arguments of row, cols to TextareaField
...
Use setColumns() and setRows() instead
2012-11-15 14:43:21 +13:00
Sean Harvey
4d110809d9
Remove deprecated rows and columns argument support from HtmlEditorField
...
Use setColumns() and setRows() instead
2012-11-15 14:43:20 +13:00
Sean Harvey
b3b071a05a
Removing deprecated FormField functions
...
setTabIndex() -> setAttribute('tabindex')
getTabIndex() -> getAttribute('tabindex')
describe() -> setDescription()
2012-11-15 14:43:20 +13:00
Sean Harvey
0d659a5e5a
Removing deprecated FormField::Name(), use getName() instead
2012-11-15 14:43:20 +13:00
Sean Harvey
c99ed7dc2b
Extending deprecation of legacy table fields to 3.1
2012-11-15 14:43:20 +13:00
Sean Harvey
b43b023c1e
Remove deprecated security token methods on Form
...
Use SecurityToken class directly instead
2012-11-15 14:43:18 +13:00
Sean Harvey
63820130c2
Remove deprecated Form::FormEncType(), use getEncType() instead
2012-11-15 14:43:17 +13:00
Sean Harvey
4e355bdb19
Removing deprecated methods on Form
...
Use FieldList API through Form::Fields() and Form::Actions() instead
2012-11-15 14:43:17 +13:00
Sean Harvey
208086754d
Removing deprecated arguments to FileField for setting folder name
...
Use setRightTitle() and setFolderName() instead
2012-11-15 14:43:17 +13:00
Sean Harvey
a9d7c9e2a6
Removing deprecated variables from FileField
2012-11-15 14:43:17 +13:00
Sean Harvey
0a5d43f1b3
Removing deprecated CompositeField::FieldSet(), use FieldList() instead
2012-11-15 14:43:17 +13:00
Sean Harvey
6448cd79bc
Removing deprecated Validator javascript methods
...
Use custom Javascript validation instead
2012-11-15 14:43:17 +13:00
Sean Harvey
de2509c3e0
Removing deprecated SimpleImageField
...
Use UploadField with
a$myField->getValidator()->setAllowedExtensions(array('jpg', 'gif', 'png'))
2012-11-15 14:43:15 +13:00
Sean Harvey
6ce33d5e59
Removing deprecated ImageFormAction
...
Use FormAction with setAttribute('src', 'myimage.png') and custom
JavaScript to achieve hover effect.
2012-11-15 14:43:15 +13:00
Sean Harvey
8156f0ff5a
Removing deprecated ImageField, use UploadField instead
2012-11-15 14:43:14 +13:00
Sean Harvey
594faf71b2
Removing deprecated FileIFrameField, use UploadField instead
2012-11-15 14:43:14 +13:00
Sean Harvey
0673f278d8
Remove deprecated FieldSet, use FieldList instead
2012-11-15 14:43:11 +13:00
Tim Klein
f0f5dcb966
fixed mediaform urls in modeladmin
...
see http://open.silverstripe.org/ticket/8013
2012-11-09 16:44:48 +13:00
Andrew O'Neil
0c8de0a1de
APICHANGE: Use late static binding for Object::has_extension()
2012-11-07 11:07:55 +13:00
Ingo Schommer
2d075671c3
ENHANCEMENT Tab style consolidation and design consistency
2012-11-06 22:28:19 +01:00
Sean Harvey
169366a011
Merge branch '3.0'
2012-11-06 13:04:21 +13:00
Sean Harvey
532699c2ac
Merge pull request #877 from UndefinedOffset/3.0
...
FIX 7906 Regression: GridFieldConfig_RelationEditor: Removing relation d...
2012-11-05 11:53:25 -08:00
Sean Harvey
fbc6e3366b
Merge branch '3.0'
2012-11-05 15:11:48 +13:00
Ingo Schommer
bcbf4636fc
BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load ( #7980 )
...
The existence of .ss-tabset triggers JS which applies $.tabs(),
and in turn interprets the first available link as the tab navigation.
jQuery UI subsequently tries to ajax-load this link, which is not
desired. Instead, $.tabs() should *only* be applied to a container
DOM element with .cms-tabset applied.
2012-11-01 00:25:13 +01:00
Ingo Schommer
2d04de0377
BUG FormField->removeExtraClass() works on indexed arrays
...
Was assuming an associative map, which isn't the case
in the current implementations.
2012-10-31 15:44:57 +01:00
Ingo Schommer
efabde1416
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
security/Member.php
2012-10-30 17:52:49 +01:00
Marcus Nyeholt
9c1b4693f7
BUG Fixed DateField date format error for IE8
...
On IE8, camel case element attributes are NOT included in the object returned
by $(elem).data(), meaning attrs defined in DateField.php (jqueryDateformat and
isoDateformat) are NOT seen by the code in DateField.js (ie the "config" var
doesn't have these set). Causing IE8 to fall back to using US date (mm/dd/yyyy)
formats. This can subsequently cause validation issues if the user's date
format is different.
DateField.js already explicitly checks for jquerydateformat (all lowercase)
so DateField.php has been modified to reflect the correct case for this
attribute name
2012-10-24 13:49:10 +11:00
UndefinedOffset
908869290e
FIX 7906 Regression: GridFieldConfig_RelationEditor: Removing relation deletes data object
2012-10-15 13:41:11 -03:00
Sean Harvey
f6a90467e4
Merge branch '3.0'
2012-10-15 10:10:01 +13:00
jean
574c53d5ba
FIX 7927 Redirect to the parent controller after deleting an item in a gridfield (edit form)
2012-10-12 18:09:17 +02:00
martimiz
5186bada17
FIX DateField Calendar - make dates with day- and monthnames validate
...
In locales other than en_US, as a result of missing jQuery locale
files, the DatePicker defaulted to English whenever day and monthnames
were used, breaking validation. Needed to change official locale files
before adding, because Zend_Date and jQuery day/monthnames not matching
again breaks validation.
Removed hard setting the names to uppercase, breaking validation for
other locales
Changed order in convert_iso_to_jquery_format(), to prevent EEE(E)
settings from being overwritten
Added a check for existing locale files, and made DatePicker fallback
to ISO yyy-MM-dd if a missing locale file would otherwise break
validation.
Added documentation for the DateField
2012-10-12 10:16:35 +02:00
Sean Harvey
bc64de0264
Fixing misleading SimpleImageField deprecation message
2012-10-11 16:58:57 +13:00
Sean Harvey
27a7fc34c1
Fixing misleading ImageField deprecation message
2012-10-11 15:40:55 +13:00
Ingo Schommer
d1ee7612f5
Merge remote-tracking branch 'origin/3.0'
2012-10-08 16:48:52 +02:00
Ingo Schommer
890bac8de3
Docs: GridFieldDeleteAction
2012-10-05 17:39:19 +02:00
Normann Lou
9aaa6b1a7b
ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty.
2012-10-05 17:00:39 +13:00
Normann Lou
1fca4911e1
BUGFIX: replace 'sapphire' with 'framework' in those legacy fields: TableField, TableListField and ComplexTableField.
2012-10-05 16:54:14 +13:00
Ingo Schommer
56f7ce1dcf
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
control/Cookie.php
control/Director.php
control/HTTPResponse.php
model/Database.php
model/MySQLDatabase.php
model/SQLQuery.php
view/Requirements.php
view/SSViewer.php
2012-10-03 16:16:19 +02:00
Damian Mooyman
4d392098a5
FIX: GridFieldPageCount now throws an exception if added to a gridfield with no gridfieldpaginator
2012-10-03 14:54:37 +13:00
Damian Mooyman
f265595c1e
NEW: GridFieldPageCount control for displaying the current page count/total in the gridview header. Designed to complement a functional pager in the grid footer.
...
NEW: GridFieldPageCount widget to default config settings
FIX: @extend .col_buttons in GridField.scss which was raising a warning
2012-10-03 14:54:37 +13:00
Sam Minnee
1f7fc1f76a
FIX Remove instances of lines longer than 120c
...
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit. This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Ingo Schommer
d504e9e634
Add .cms-tabset on all GridFieldDetailForm instances
...
This allows us to add cms behaviour consistently
2012-09-28 16:37:35 +02:00
Howard Grigg
aa6f345d1d
API FormField::name_to_label() for unlabelled fields
...
Will convert camel case to spaces, e.g. "TotalAmount"
to "Total Amount".
2012-09-26 11:20:34 +02:00
Simon Welsh
1e629f4585
Merge branch '3.0'
...
Conflicts:
control/Cookie.php
control/Director.php
dev/Profiler.php
view/Requirements.php
2012-09-21 14:56:56 +12:00
Ingo Schommer
e2f073f38a
Method visibility according to coding conventions
2012-09-20 10:46:59 +02:00
Sean Harvey
6ab04a6a55
Refer to setColumns in deprecation message instead of non-existent setCols
2012-09-18 09:39:08 +12:00
Sean Harvey
9c2be0f025
Merge branch '3.0'
2012-09-17 15:16:52 +12:00
Will Rossiter
15f40af4eb
Merge pull request #794 from creamarketing/ListboxField_Inconsistency
...
FIX: ListBoxField and DropdownField should respect getSource()
2012-09-14 14:11:01 -07:00
Tom
54d8abcdc7
Bug:ListBoxField and DropdownField does not respect getSource in all Places
...
In some places source is referenced directly and assumed to be array, while in some places the getSource() method is used instead.
By changing this you have more freedom when extending these classes
2012-09-14 16:08:34 +03:00
Ingo Schommer
6544c8fc13
Merge remote-tracking branch 'origin/3.0'
2012-09-11 14:05:45 +02:00
Ingo Schommer
f5ff607a0a
Localization for "cancel" button in GridFieldDetailForm
2012-09-11 13:47:12 +02:00
Ingo Schommer
1088d044c5
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
.travis.yml
2012-09-07 17:21:41 +02:00
Simon Welsh
d2b4e0df01
BUG Use the manipulated datalist for counting total items.
...
This allows other Manipulators to change the total size of the List before
pagination is applied.
2012-09-06 23:47:38 +12:00
Simon Welsh
4ead89a4d0
API Adds getManipulatedList() method to GridField to get the SS_List after applying Manipulators
2012-09-06 23:42:48 +12:00
Andrew O'Neil
aa52dae464
BUGFIX: Don't add ss-tabset class to GridFieldDetailForms without tabs, as this causes the first <ul> within the form to have tabs applied
2012-09-05 14:16:28 +12:00
Ingo Schommer
52263e6a5f
BUG Gridfield fails when save changes filter criteria ( fixes #7785 )
2012-09-02 16:57:50 +02:00
Zauberfisch
d24ea5ec97
BUG jQueryUI configs broken because keys were all lowercase
2012-09-02 12:51:25 +02:00
Saophalkun Ponlu
f3fcae315d
BUG Fix wrong date conversion from PHP format 'y' to jquery date and back.
...
While 'y' in PHP means 4 digits year (e.g. 2012), jquery date picker means 2 digits (e.g. 12). That's all fine until then but when you pass the 2 digit year value back to PHP it all goes awry.
For exmple, defatult date format in en_US is 'MMM d, y' so in jquery date picker it's something like this 'Aug 22, 12' and eventually PHP will convert that value to '0012-08-22' which completely wrong.
2012-08-30 22:21:04 +02:00
Ingo Schommer
3946a3e991
Merge pull request #746 from phalkunz/7601-listview-sort-by-title
...
GridFieldSortableHeader now allows composite fields to be sorted based db fields (see #7601 )
2012-08-29 05:41:50 -07:00
jean
14759b6ff1
FIX #7787 Handles ajax and normal requests differently when validation fails on gridfields
2012-08-29 13:00:05 +02:00
Zauberfisch
70b22fa4ca
API CHANGE: GridFieldConfig should extend object to make use of Object::create() this also fixes GridFieldConfig_RecordViewer::create() which was not working before
...
but don't extend Object
2012-08-29 12:45:23 +12:00
Saophalkun Ponlu
e595b8fc75
GridFieldSortableHeader now allows composite fields to be sorted based db fields (see #7601 )
2012-08-28 21:15:46 +12:00
Sam Minnee
824afffd2e
Merge branch '3.0'
2012-08-23 12:39:41 +12:00
James Cocker
9a8313dce0
BUGFIX: GridField delete icon now correctly deletes, rather than always just unlinking (Fixes 7801)
...
Fixes the handleAction function of GridFieldDeleteAction which wasn't differentiating between a 'deleterecord' action and an 'unlinkrelation' action.
Fixes http://open.silverstripe.org/ticket/7801
2012-08-21 23:31:34 +01:00
Sam Minnee
f9b1485640
Merge branch '3.0'
2012-08-21 14:38:19 +12:00
Ingo Schommer
06cddb747a
BUG Force refresh of GridFieldDetailEditForm after save
...
Wasn't refreshing after ajax save operations on existing
content, as the URL didn't change, and hence the CMS
didn't reload the view. Return the view directly instead,
unless we're dealing with new records (= changed URL).
2012-08-20 15:08:30 +02:00
Ingo Schommer
4cc82e906b
Merge remote-tracking branch 'origin/3.0'
2012-08-20 10:13:55 +02:00
unclecheese
4fde42f72e
ENHANCEMENT: Add "jpeg" to list of allowed extensions
...
.jpeg is the correct extension for these files, and they were being filtered out of the list.
2012-08-17 13:17:26 -03:00
Ingo Schommer
472752361a
Added correct CSS class to GroupedDropdownField
2012-08-16 23:31:13 +02:00
mightycoco
5f94d23000
ENHANCEMENT: Ntfcatn. image embedding(trac #7438 )
...
Adding an additional warning / notification message, when author embedds an external image.
2012-08-16 21:03:37 +02:00
Ingo Schommer
3bce3550d3
Merge remote-tracking branch 'origin/3.0'
2012-08-12 22:21:06 +02:00
Jak
b649c09b08
BUG prevent notice when using selection group
2012-08-10 18:53:33 +12:00
Naomi Guyer
ae52be54f0
FIX: Missing last login time (fixes 7666)
...
Add in missing user login time
2012-08-10 18:08:53 +12:00
Ingo Schommer
cac540d252
Merge branch '3.0'
2012-08-10 00:19:00 +02:00
martimiz
deb3780a45
BUG #7768 - add-button and breadcrumb translation in Security, ModelAdmin
...
The classnames on the add-new button and breadcrumbs were not
translated due to the use of singular_name() instead of
i18n-singular_name() in GridFieldAddNewButton and GridFieldDetailForm.
2012-08-09 23:46:40 +02:00
Ingo Schommer
b69813af9f
Merge branch '3.0'
2012-08-09 12:47:26 +02:00
Ingo Schommer
fb7008627c
Merge remote-tracking branch 'origin/3.0'
2012-08-09 10:47:44 +02:00
Damian Mooyman
d172e160a8
FIXED: Bug in GridFieldAddExistingAutocompleter.php where an uninitialised variable would occasionally crash searches
...
REMOVED: Unused variable
2012-08-09 15:04:02 +12:00
jean
90b0fe8db7
FIX Only reload data for a item edited through a GridField if the record exists. Fix 7721
2012-08-04 10:53:13 +12:00
Andrew Short
1900842d37
Make the list used for autocomplete search results settable.
...
This is useful if you want to limit the autocomplete results to a subset
of all available objects.
2012-08-02 21:25:45 +12:00
Andrew Short
f5b25d2dff
Make the list used for autocomplete search results settable.
...
This is useful if you want to limit the autocomplete results to a subset
of all available objects.
2012-08-01 17:16:18 +10:00
Hamish Friedlander
3efdb5c981
Merge in changes from 3.0.1 final
2012-07-31 16:51:10 +12:00
Hamish Friedlander
bbb0868227
Merge in changes from 3.0.1-rc3
2012-07-30 11:53:12 +12:00
jakr
13bf61d402
Reformatted GridFieldDataColumns->castValue and added missing assignment.
2012-07-29 21:40:14 +02:00
Hamish Friedlander
9c4e4747c9
BUG 15e2efb55d
broke the Page ListView.
2012-07-28 15:42:39 +12:00
Juerg Rast
4848becf5e
Removed duplicated 'return '
2012-07-28 01:11:03 +02:00
jakr
15e2efb55d
FIX 7590: Image thumbnails broken in gridfield
...
Delay converting the object to a string and escaping its value until the end of getColumnContent. Call formatValue BEFORE castValue, so that formatValue can create raw HTML by casting to HTMLText afterwards.
2012-07-27 14:05:41 +12:00
Ingo Schommer
3ae8b0b665
Merge remote-tracking branch 'origin/3.0'
2012-07-18 15:00:06 +02:00
Ingo Schommer
1a91431d39
Query param searches for GridFieldAddExistingAutocompleter
...
Fixes issues with query construction in JS when the search URL
already contains GET paramters (e.g. when using the 'translatable'
module).
2012-07-17 13:26:33 +02:00
Andrew Short
8d38551297
Don't change track autocompleter fields.
2012-07-17 12:07:53 +02:00
Andrew Short
8c0a8539c7
Limit the results shown in the autocompleter.
2012-07-17 12:07:53 +02:00
Ingo Schommer
b42a76bebc
Fluent interface for ToggleCompositeField
2012-07-15 21:28:09 +02:00
jakr
78038eb75e
FIX 7617: Back button in CMS after Add/Edit/View action in GridField does not work
2012-07-13 16:53:42 +02:00
Ingo Schommer
712f28bc78
Scoped deprecation messages ( fixes #7645 )
2012-07-13 11:37:35 +02:00
Juerg Rast
8d3d3a7229
Typo in the Filename of the CSS-File
2012-07-12 23:09:22 +02:00
Mateusz Uzdowski
7c41ff22ab
BUG Change all shortcodes into the new, comma separated, format.
...
Space delimiter is often confused by browsers, and encoded as %20 which
breaks the shortcode system. Change to comma delimitation has already
been implemented, this is a followup cleanup.
Ref http://open.silverstripe.org/ticket/7337
2012-07-12 16:44:21 +12:00
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