Commit Graph

877 Commits

Author SHA1 Message Date
Ingo Schommer
f5be047b97 BUGFIX Stop IE6/IE7 from redirecting in admin/assets after deleting multiple folders (fixes #5208)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:24 +13:00
Will Rossiter
1a3a8d0a0c MINOR: removed duplication of variable and conditional that would never pass
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:24 +13:00
Sam Minnee
b6a41ebc19 BUGFIX #5295: Update CMS site name in LHS via Ajax after siteconfig save.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Andreas Piening
b9b4acabaf BUGFIX: keep ModelAdmin from importing data twice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Ingo Schommer
97a0abb2cc MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101752 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Sean Harvey
4469b0028a BUGFIX RedirectorPage types shouldn't appear in "Pages with no content" side report in the CMS Pages tab
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Ingo Schommer
e507f9488b BUGFIX Only show "Roles" tab in admin/security if user has APPLY_ROLES permissions (fixes #5258)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:21 +13:00
Mateusz Uzdowski
fb16cc63f6 BUGFIX: put back into the SSNavigator the archived site link (#5251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:19 +13:00
Sam Minnee
11392e5bb2 BUGFIX: Make SS_ReportWrapper::sourceRecords()' arguments optional
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Ingo Schommer
5271e54972 MINOR Fixed wrong default value for AssetAdmin (see r101106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer
67e55a7f99 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Sam Minnee
fd42eae95b MINOR: Use castingHelper() rather than castingHelperPair() to look for a field presence.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer
3e9424ac27 MINOR Fixed permission language code regression
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
3ed6e4df05 MINOR Adjusted CMSMain->getRootForm() to SiteConfig API changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100974 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
6378a0fece MINOR Using jquery.live and behaviour.js instead of livequery in ModelAdmin.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Will Rossiter
2b99e45627 BUGFIX: Fixed notice level error with folder ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Will Rossiter
b033c1839c BUGFIX: fixed file uploading not uploading any files at all
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Ingo Schommer
bc0934ae10 MINOR Moved PermissionCheckboxSetField specific javascript logic from MemberTableField.js to new sapphire/javascript/PermissionCheckboxSetField.js file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:10 +13:00
Ingo Schommer
3cb46c28b5 MINOR Improved help texts around permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:10 +13:00
Ingo Schommer
5e42eee71a MINOR Improved help texts around permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:09 +13:00
Ingo Schommer
13ee9391bf ENHANCEMENT Better editing of roles through SecurityAdmin instead of a new "Roles" tab. Removed (previously unreleased) PermissionRoleAdmin. (see #4757)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:08 +13:00
Tom Rix
2128b4cf1e BUGFIX reload page if broken link tracking values changed during a save. Ticket #1363
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Ingo Schommer
abe4049c3d BUGFIX Unsetting 'ID' parameter in MemberTableField->addtogroup() to avoid confusion between Group and Member records (regression from r100716) (from r100720)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100721 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Ingo Schommer
9466e07335 BUGFIX Fixed MemberTableField->addtogroup() to fetch existing Member records by ID or $unique_identifier_field instead of relying on the (now removed) "auto-merging" in Member->onBeforeWrite() (see r100705) (from r100716)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Mateusz Uzdowski
3f6a4dedfd BUGFIX: moving the ajaxupdatesort JS response code from php to js to get rid of eval. Also disable the "loading" on the moved element when we are done, in case we are repositioning other than the selected item - otherwise the progress indicator is displayed indefinitely.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Geoff Munn
ff236fe98d BUG FIX: column names quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Sean Harvey
2a9be51b90 MINOR Removed underscores from combined files in LeftAndMain, made redundant by r100536
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
79ce73c757 MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Mateusz Uzdowski
98cec468b2 BUGFIX: replacing calls to deprecated Upload functions - using validator instead (related to r100057)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
56a32fe5c6 MINOR Reverted r100484 as it was causing too many problems
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
df46043a67 MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
bed912822c BUGFIX #5135 LeftAndMain extra requirements loading for "themedcss" should use Requirements::themedCSS() not Requirements::css() - thanks Hamish!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Tom Rix
29c857d34c MINOR add extendability to SecurityAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
b810f0ecbc BUGFIX #5023 AssetAdmin::sync() is now used to sync tasks, as it works when the user only has access to the AssetAdmin controller instead of going to dev/tasks/FilesystemSyncTask which can only be run by administrators or if the site is in dev mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Will Rossiter
681eff9eda ENHANCEMENT: allow ordering of page commented to be configurabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Sean Harvey
4dd3740682 ENHANCEMENT AssetAdmin now uses Upload_Validator instead of setting the rules directly on Upload
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100058 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Ingo Schommer
55520f1523 BUGFIX Setting default $groups in MemberTableField::AddForm() in addition to MemberTableField_Popup::__construct() - this was broken by r99777
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99993 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Luke Hudson
8fe62100c6 BUGFIX: Use underscores in names of combined .js (#3581)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Sam Minnee
6b1f258c44 BUGFIX #5073: Fixed CMS version indicator for alpha and beta versions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Tom Rix
a11effb33a BUGFIX make siteconfig work again
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:04 +13:00
Ingo Schommer
a0c69ad63f MINOR Fixed MemberTableField regression from r99706 (from r99710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99714 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:03 +13:00
Ingo Schommer
f088acf5e3 BUGFIX Fixed MemberTableField limiting of , wasnt taking children groups into account (regression from r99684) (from r99706)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99713 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:02 +13:00
Ingo Schommer
9a5b429ad1 BUGFIX Setting ID explicitly in MemberTableField-> to ensure getCsvQuery() correctly filters (the custom group filter was only implemented in sourceItems() before) (from r99684)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:02 +13:00
Ingo Schommer
f47e12f726 ENHANCEMENT Saving group relations on SecurityAdmin->EditForm()/RootForm() through TreeMultiselectField instead of hidden 'Group'/'GroupID' values (from r99579)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
7f3c14784f MINOR Fixed height of MemberTableField 'Groups' tab to allow enough room for TreeMultiSelectField expansion (from r98883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
8c67b1a01e ENHANCEMENT Saving MemberTableField through new 'Groups' field added in Member->getCMSFields(). (from r98882)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
033d27ac3f MINOR Moved ul.tree rules from cms/css/cms_left.css to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox styling) (see r98854) (merged from r98855) (from r98865)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
0a137a4840 ENHANCEMENT Making setting optional in MemberTableField. Field instances without will list all members unfiltered, and remove members from the database rather than the group relation.
ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField through setPermissions(array('inlineadd')) (from r98825)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:58 +13:00
Tom Rix
5b36ce5cc0 BUGFIX use the correct method for retrieving the report ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Tom Rix
4539825a1b MINOR add pass thru group and sort methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00