tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
4,868 Commits 29 Branches 403 Tags 28 MiB
0f646ba375
Commit Graph

140 Commits

Author SHA1 Message Date
Ingo Schommer
51c8e8639e API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:21:04 +01:00
Sam Minnee
b7b62e5aea FIX: Fixed create-folder function: 2013-02-26 13:39:48 +13:00
Ingo Schommer
9403dd6e38 Respecting model permissions in AssetAdmin 2012-12-16 23:32:09 +01:00
Ingo Schommer
a8478d2e46 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-14 10:55:51 +01:00
Niklas Forsdahl
d42c0041d2 BUG: Fixed pagination functionality on root assets folder 
Moving to another page in the GridField for the root assets folder in AssetAdmin
caused all files to be displayed. This was caused by the functionality that tries
to fix some edge cases for detail view kicked in and didn't filter the list properly.

Fixed by making the edge case detection a little more specific (i.e. checking if
a numeric ID was sent as a request variable).
 2012-12-13 16:31:19 +02:00
Ingo Schommer
e6e12fe00e Merge branch '3.0' 
Conflicts:
	composer.json
 2012-11-22 23:48:18 +01:00
Ingo Schommer
65fe8e5ae3 Fixed line length 2012-11-19 01:18:01 +01:00
Kirk Mayo
d58b23d6fa BUG AssetAdmin filter array indices (fixes #8014) 2012-11-19 00:51:12 +01:00
Sean Harvey
94b37dbeb0 Fixing AssetAdmin to use static FormField::create_tag() 
Instead of createTag() which is deprecated
 2012-11-15 14:32:52 +13:00
Ingo Schommer
a52514a306 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:24:01 +01:00
Naomi Guyer
0d642af136 BUG: Filter in asset grid appears in incorrect place 
Moved the filter component in the asset gridfield to after the sortable
header
 2012-10-23 15:00:49 +13:00
Sam Minnée
de4f207534 Merge pull request #208 from halkyon/upload_assets_changes 
Uploads go to "assets/assets" instead of root of assets
 2012-10-10 13:24:06 -07:00
Sean Harvey
118b28dea1 BUG setFolderName in CMSFileAddController should default to the root 
setFolderName expects a folder name relative to the root. Specifying
ASSETS_DIR will create a duplicate folder called "assets", so the
file gets uploaded into "assets/assets". Specifying "/" means the
file will get uploaded into the root instead, which is correct.
 2012-09-21 16:00:35 +12:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
jean
53fdafb473 NEW 7839 Support for documents as a file type in Files and images 2012-09-04 11:26:09 +12:00
jean
62cfd871b6 FIX 7819 Check if the current folder ID is in the url before assuming the list should not filter by folder ID 2012-08-28 16:43:54 +12:00
Ingo Schommer
6b6dfaed7b Fixed i18n namespace for "Sync Files" 2012-08-26 23:58:38 +02:00
Naomi Guyer
ef651d9d93 ENHANCEMENT: Add GridfieldLevelup component to files area 2012-06-26 13:35:38 +02:00
Sam Minnee
792c9058fa BUGFIX: Fixed DataList operations to respect the fact that they're idempotent. 2012-06-15 15:30:08 +12:00
Ingo Schommer
3c81958345 MINOR Only set folder field state in AssetAdmin if a folder is shown 2012-06-14 20:21:28 +02:00
Ingo Schommer
a64cf8c27b BUGFIX AssetAdmin->delete() is now allowed, and redirects to parent folder automatically 2012-06-14 20:21:04 +02:00
Ingo Schommer
eaf05a6a7c BUGFIX AssetAdmin root navigation (fixes #7448) 
Return a new object instance rather than relying on singleton(),
which might've been modified elsewhere, and have a non-zero ID/ParentID.
 2012-06-14 09:42:55 +02:00
Ingo Schommer
ca9f4f6f6f Merge branch 'pjax-multiple' 2012-06-05 14:01:20 +02:00
Ingo Schommer
8b8de0564c BUGFIX Don't filter AssetAdmin list view when showing detail view (fixes #7408) 2012-06-05 13:42:38 +02:00
Ingo Schommer
c9fc7cda65 ENHANCEMENT Declaring Pjax fragments on CMS templates and forms 2012-05-30 15:06:54 +02:00
Sean Harvey
d9ee61c4a3 MINOR Use of DropdownField in CMS should call setEmptyString instead of 
use the $emptyString argument, as it's deprecated.
 2012-05-23 22:43:42 +12:00
Sean Harvey
5b223aa3b5 MINOR Use GridFieldToolbarHeader and GridFieldFilterHeader in AssetAdmin GridField, set title of the table to the current folder title. 2012-05-16 17:32:52 +12:00
Ingo Schommer
73e5c34896 BUGFIX Encoding multibyte characters in custom X-Status HTTP headers used in CMS (headers don't allow multibyte data) 2012-05-14 15:11:35 +02:00
Sean Harvey
d79d5987cb Merge pull request #110 from chillu/trac/7170-i18n-sprintf-injections 2012-05-09 19:55:53 +12:00
Ingo Schommer
f812e56022 ENHANCEMENT Moving action buttons in AssetAdmin to "details" tab (fixes #7221) 2012-05-03 11:26:09 +02:00
Ingo Schommer
f8abcd8fa5 Merge pull request #112 from silverstripe-big-o/Trac-7266-sync-files-icon 
ENHANCEMENT:Trac 7266 - added an icon to the 'sync files' button in Asse...
 2012-05-03 02:24:15 -07:00
Jeremy Bridson
3cdca3ea05 ENHANCEMENT:Trac 7266 - added an icon to the 'sync files' button in AssetAdmin + regenerated css files. 2012-05-03 12:17:49 +12:00
Ingo Schommer
38f1236b1f MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:05:19 +02:00
Robert Curry
7850499687 ENHANCEMENT: Part of fix to #7010. Change to some gridfield calls to setDisplayFields and friends. 2012-04-19 12:07:10 +12:00
Ingo Schommer
52e69dd1fd MINOR Removed usage of deprecated $priority argument for _t() 2012-04-15 16:49:31 +02:00
Simon Welsh
c4e018928e API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:56:40 +12:00
Sean Harvey
6b3d8904e3 BUGFIX Fixed broken test LeftAndMain caused by createTag being called 
statically in AssetAdmin, when it shouldn't be
 2012-04-12 13:04:01 +12:00
Ingo Schommer
363dc9a4a9 MINOR Searching both Title and Filename in AssetAdmin (fixes #7013, see pull request #71) 2012-04-11 16:18:38 +02:00
Ingo Schommer
57d7655f80 Merge pull request #91 from silverstripe-big-o/silverstripe-cms 
---

...the designs.

Conflicts:
	code/controllers/AssetAdmin.php
	code/controllers/CMSMain.php
 2012-04-11 16:17:51 +02:00
Sam Minnee
ca4e8e1bdb BUGFIX: Fixed sort order of files and images GridField 2012-04-11 18:13:45 +12:00
Jeremy Bridson
778fd28877 BUGFIX:Trac #6854 / #7115 - aligned action buttons in filter panel with the designs. 2012-04-11 16:01:15 +12:00
Ingo Schommer
3341a181c7 MINOR Using SS_HTTPRequest->isAjax() instead of deprecated RequestHandler API 2012-04-05 14:45:26 +02:00
Ingo Schommer
de573e087d MINOR Using late static binding instead of Object::create() calls 2012-04-04 18:29:11 +02:00
Sean Harvey
070c9c22aa BUGFIX Removed used of deprecated Name() method in AssetAdmin 2012-04-04 12:05:38 +12:00
Sean Harvey
10f030de67 BUGFIX When adding a top level folder in AssetAdmin, ensure you are 
taken back to the top level folder view. Currently there is a non-object
error adding a root level folder.
 2012-03-27 09:54:47 +13:00
Will Rossiter
a39231f952 MINOR: add icon to ajax button in AssetAdmin 2012-03-24 14:30:10 +13:00
Ingo Schommer
3248da02ce MINOR Simplified ajax/non-ajax responses in CMS. Browsers handle 3xx Ajax responses transparently, so a CMS redirect (and some smartness in the JS state handling) is enough, no conditionals required. 2012-03-12 13:45:10 +01:00
Andrew O'Neil
59981982f4 MINOR: Switch edit and delete buttons on file gridfield 2012-03-12 10:27:05 +01:00
Ingo Schommer
4225c0a966 MINOR Flattened AddForm and SiteConfig CMS logic, moved from base classes to specialised classes for better overview, and less inheritance where its not necessary. 2012-03-09 23:35:43 +01:00
Ingo Schommer
04a195b111 MINOR Stop using FormResponse, which has been removed from core 2012-03-09 23:20:09 +01:00
Sam Minnée
aaa52d59e6 Merge pull request #67 from silverstripe-scienceninjas/pull/6921-renaming-of-gridfields 
Pull/6921 renaming of gridfields
 2012-03-08 17:50:31 -08:00
Stig Lindqvist
ec06f1db8e API CHANGE Renamed GridFieldDefaultColumns to GridFieldDataColumns #6921 2012-03-09 14:08:43 +13:00
Sam Minnee
4c7f3e0836 BUGIFX: Use limit() instead of deprecated getRange() in AssetAdmin. 2012-03-09 13:53:28 +13:00
Stig Lindqvist
b8399aa85e API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:30 +13:00
Ingo Schommer
439b9c1f29 ENHANCEMENT Removing notion of "root" identifier string for the base folder in AssetAdmin, using 0 explicitly = clearer logic. Fixed breadcrumbs to work with this as well. 2012-03-08 22:18:07 +01:00
Ingo Schommer
a30a615de4 MINOR Extending CMSFileAddController off LeftAndMain to fix problems with inherited templates (wrong .cms-content styling when requesting via ajax, due to inherited AssetAdmin templates) 2012-03-08 21:18:39 +01:00
Ingo Schommer
1789287bd2 MINOR No longer using iteratorproperties() directly 2012-03-08 20:25:51 +01:00
Ingo Schommer
f085583b61 ENHNANCEMENT Creating folders via (faster) JavaScript prompt in AssetAdmin, implicitly fixing AssetAdmin->doAdd() layout issues after submitting 2012-03-08 18:24:33 +01:00
Ingo Schommer
c226554b5a MINOR Adjusted AssetAdmin to GridFieldAction_ * class renames 2012-03-08 15:25:45 +01:00
Ingo Schommer
3670fe0530 ENHANCEMENT Show AssetAdmin breadcrumbs+tabs outside of search+editform panels 2012-03-07 17:02:08 +01:00
Ingo Schommer
9981c929e0 MINOR Fixed breadcrumbs in CMSFileAddController 2012-03-07 17:01:08 +01:00
Ingo Schommer
915dc7f27c MINOR Fixed wrong "add folder" css class + behaviour 2012-03-07 14:37:12 +01:00
Normann Lou
434dbdb286 MINOR SSF-30 : add extra class to Tab (GalleryView) to AssetAdmin EditForm 2012-03-07 16:52:29 +13:00
Normann Lou
ecb31ce30a MINOR SSF-30 : add extra field to Tabs (listView and TreeView) to LeftAndMain EditForm 2012-03-07 14:28:57 +13:00
Ingo Schommer
b6f73eb290 MINOR Title for "sync files" button 2012-03-06 11:25:41 +01:00
Julian Seidenberg
adefc15e5a API-CHANGE: SSF-33 Adding "look for new files" trigger. Removing the legacy implementation of SyncForm and replacing it with an implementation that can be triggered via ajax. 2012-03-06 18:22:31 +13:00
Ingo Schommer
e0a67a80c7 BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code. 2012-03-05 18:42:44 +01:00
Ingo Schommer
d1581c2b9b ENHANCEMENT Refactored AssetAdmin to use SearchContext for filtering records, rather than relying on GridFieldFilter - less coupling to one view (we also have gallery and tree views), and more flexible filtering on columns/criteria which are not present in GridField 2012-03-02 20:45:34 +01:00
Ingo Schommer
18e612e65b MINOR Moved CMSMain.GridField.js logic into LeftAndMain.js (applies to all CMS interfaces), fixed event bugs with GridField overloading in AssetAdmin.js 2012-03-01 00:19:34 +01:00
Ingo Schommer
6860c5dd9f MINOR Consolidated AssetAdmin->FilterForm() button styling and labels with CMSMain 2012-02-29 21:06:21 +01:00
Ingo Schommer
e96d6f5bd5 MINOR Linking breadcrumbs to root node via AssetAdmin->Breadcrumbs() 2012-02-28 20:11:07 +01:00
Ingo Schommer
f78ab9097a MINOR Reinstated getting current record ID from session in AssetAdmin in order to allow routing to GridFieldPopupForms detail views (admin/assets/show/99 vs admin/assets/EditForm/field/...) 2012-02-28 20:10:39 +01:00
Andrew O'Neil
80fe9c8864 MINOR: SSF-106 Include cms gridfield javascript hooks 2012-02-28 15:58:19 +01:00
Ingo Schommer
5a69985a52 Merge branch '106-add-edit-records' 2012-02-28 00:22:49 +01:00
Ingo Schommer
f216c783c6 Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12' 2012-02-23 23:39:06 +01:00
Ingo Schommer
09fd710dd4 MINOR Combining CSS in CMS, added AssetAdmin styles 2012-02-23 23:15:37 +01:00
Ingo Schommer
c582f08ea3 MINOR Ensuring a valid Folder object is returned from AssetAdmin->currentPage() to avoid breaking AssetAdmin->getEditForm(), e.g. when a GridField search is conducted 2012-02-23 23:15:37 +01:00
Ingo Schommer
c7c2a2c409 ENHANCEMENT New "add folder" logic for AssetAdmin 2012-02-23 23:15:37 +01:00
Ingo Schommer
71c7664c95 MINOR Moved AssetAdmin-specific fields from Folder->getCMSFields() to AssetAdmin->getEditForm(), added button icons and toolbar 2012-02-23 23:15:35 +01:00
Stig Lindqvist
876c809a7d ENHANCEMENT Filterpanel for assetadmin 2012-02-21 16:02:54 +13:00
Ingo Schommer
f620f9b46c MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons 2012-02-17 15:30:37 +01:00
Ingo Schommer
68e9e91a78 ENHANCEMENT New panel styling for AssetAdmin and CMSFileAddController (SSF-24) 2012-02-16 13:59:29 +01:00
Fred Condo
d99e3a0927 Code cleanup: removed trailing ?> markers per code standard. 
All cms module except lang directory.
 2012-02-13 12:48:41 -08:00
Ingo Schommer
acd2f6bacf API CHANGE Removed AssetAdmin metadata upload capabilities, please use the new UploadField inline editing support 
EHNAHCEMENT Moved AssetAdmin->upload() and related functionality to new UploadField class
 2012-02-03 00:11:11 +01:00
Stig Lindqvist
7de585103f BUGFIX: Can't upload files to root folder 2012-01-10 14:02:19 +13:00
Stig Lindqvist
1f190eb698 BUGFIX: Return a RootForm for AssetAdmin so Form get the correct Fields on POST 
Solves issues with GridField and uploading on the root folder (/assets/)
 2012-01-10 14:01:25 +13:00
Stig Lindqvist
05e90838c0 API CHANGE Switch usage from FieldSet to FieldList 2011-10-27 20:24:45 +02:00
Ingo Schommer
093eb6cd53 MINOR Checking for success of file upload before trying to add metadata in AssetAdmin->doUpload() (AIR-37) 2011-10-07 12:02:16 +02:00
Ingo Schommer
2ef1ae397a MINOR Fixed method signature on batch actions 2011-10-04 13:24:01 +02:00
Will Rossiter
d90ea0d236 ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain API. 2011-09-19 17:30:46 +02:00