Commit Graph

1721 Commits

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