Commit Graph

303 Commits

Author SHA1 Message Date
Ingo Schommer
03acbb737e MINOR Translatable strings in CMSMain (fixes #6523, thanks Tonyair) 2011-03-20 09:59:26 +13:00
Ingo Schommer
4eac937da6 BUGFIX Reconstruct form before returning from LeftAndMain and CMSMain controller actions, in order to avoid stale form fields or form actions (e.g. after hitting CMSMain->unpublish(), the 'unpublish' FormAction has to be removed from the existing form) 2011-03-16 17:53:10 +13:00
Ingo Schommer
824f7451a0 ENHANCEMENT Supporting passing in objects in LeftAndMain->getRecord() (and subclasses) in order to reduce boilerplate code in controller actions 2011-03-16 16:39:49 +13:00
Ingo Schommer
495e15be9f MINOR Fixed merge errors 2011-03-16 14:18:59 +13:00
Julian Seidenberg
1c5f161384 BUGFIX: added SideReportForm back in as an allowed action, which is called when loading a new page in the CMS. 2011-02-24 17:03:24 +13:00
Sam Minnee
e45f4c923c MINOR: Misc fixes to clean up the 2.4 mergeback. 2011-02-22 10:52:56 +13:00
Sam Minnee
3498e41b0a Merge branch '2.4'
Conflicts:
	_config.php
	code/AssetAdmin.php
	code/AssetTableField.php
	code/CMSBatchAction.php
	code/CMSBatchActionHandler.php
	code/CMSMain.php
	code/CMSSiteTreeFilter.php
	code/CommentAdmin.php
	code/CommentTableField.php
	code/GroupImportForm.php
	code/LeftAndMain.php
	code/MemberImportForm.php
	code/MemberTableField.php
	code/ModelAdmin.php
	code/PermissionRoleAdmin.php
	code/ReportAdmin.php
	code/SecurityAdmin.php
	code/SideReport.php
	code/reports/BrokenLinksReport.php
	code/sitefeatures/MathSpamProtection.php
	code/sitefeatures/PageComment.php
	code/sitefeatures/PageCommentInterface.php
	code/sitefeatures/SSAkismet.php
	css/cms_left.css
	css/cms_right.css
	css/layout.css
	css/silverstripe.tabs.css
	images/loading.gif
	javascript/AssetAdmin.js
	javascript/AssetTableField.js
	javascript/CMSMain_left.js
	javascript/CMSMain_right.js
	javascript/LangSelector.js
	javascript/LeftAndMain.Tree.js
	javascript/LeftAndMain.js
	javascript/LeftAndMain_right.js
	javascript/MemberImportForm.js
	javascript/MemberTableField.js
	javascript/ModelAdmin.js
	javascript/PageCommentInterface.js
	javascript/ReportAdmin_left.js
	javascript/ReportAdmin_right.js
	javascript/SecurityAdmin_right.js
	javascript/SideReports.js
	javascript/SideTabs.js
	javascript/SitetreeAccess.js
	javascript/TranslationTab.js
	javascript/WidgetAreaEditor.js
	javascript/lang/cs_CZ.js
	javascript/lang/en_US.js
	javascript/lang/sk_SK.js
	javascript/tinymce_ssbuttons/editor_plugin_src.js
	javascript/tinymce_ssmacron/editor_plugin_src.js
	lang/en_US.php
	templates/Includes/AssetAdmin_left.ss
	templates/Includes/AssetTableField.ss
	templates/Includes/CMSMain_left.ss
	templates/Includes/CommentTableField.ss
	templates/Includes/ModelAdmin_left.ss
	templates/Includes/SecurityAdmin_left.ss
	templates/PageCommentInterface.ss
	templates/PageCommentInterface_singlecomment.ss
	templates/ReportAdminForm.ss
	tests/CMSMainTest.php
	tests/CMSMainTest.yml
	tests/LeftAndMainTest.php
	tests/MemberTableFieldTest.php
	tests/MemberTableFieldTest.yml
	thirdparty/multifile/multifile.js
2011-02-15 11:50:24 +13:00
Sean Harvey
27aad3deca BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
25de6303a8 BUGFIX Allowing CMSMain->rollback() outside of form contexts, temporariliy disabling CSRF protection. Necessary in order to get rollback actions working from admin/getversion (regression from 2.4.4 release, see #6291)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115313 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
6a02f2edb5 BUGFIX Removing form actions from $allowed_actions in AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission() (from r115185)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Sean Harvey
77c5701fa6 BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!) (from r114940)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
6df2e74323 MINOR Fixed regression from r113282 for changed SecurityToken API in CMSMain->publishall() (fixes #6159)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer
bc3df654bd API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer
b31cb6731e MINOR Removed unused Security->addmember() (see MemberTableField and SecurityAdmin->addtogroup())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113280 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Sean Harvey
c134b8e020 BUGFIX #5811 Fixed default selection of root node when CMS first opened (no currentPage set in session)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110439 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Ingo Schommer
3ef552d539 MINOR Disabled 'showcalendar' option on CMSMain->SiteTreeFilterDateField() - it causes the CMS to load jQuery UI javascript just for this (rarely used field). To be re-enabled once we work with jQuery UI on a broader scale.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:44 +13:00
Luke Hudson
2845529234 BUGFIX: Apply AJShort's patch to fix SiteConfig (trac 5671)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106351 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Ingo Schommer
6d74db77ff BUGFIX Setting 'ID' field on CMSMain->RootForm() so it can work with formfields that require it (fixes #5671, thanks ajshort)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Normann Lou
5cbb94b43b MINOR: add more in-line documentation and fix the typo: should => should not
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Normann Lou
f19c5200d1 ENHANCEMENT: to make the FileIFrameField and TreeSelectionField easy to use in CMS with Translatable on.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Ingo Schommer
99b5937f42 MINOR Fixed phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Carlos Barberis
219e55ef55 MINOR: reverted wrong change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Carlos Barberis
ebea43ebd8 ENHANCEMENT: added language (Ticket #5390)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Will Rossiter
b7a9287844 BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +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
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
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
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
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
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
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
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
Ingo Schommer
12761de90b MINOR Using DateField in CMSMain->SiteTreeFilterDateField(), as CalendarDateField is now deprecated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99363 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:56 +13:00
Ingo Schommer
c941ca899a MINOR Fixed merge error (see r99114)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
7ea8f1c7f4 APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:51 +13:00
Ingo Schommer
bf2924e159 BUGFIX: Fix navigator links not opening in new windows. (from r97510)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
8d359d1703 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:49 +13:00
Ingo Schommer
032ce7f60b MINOR pingStatus ping frequency reduced
MINOR updated lang file for SiteConfig
MINOR improved documentation in StaticPublisher
MINOR improved documentation in CMSMain surrounding reports and siteconfig
MINOR migrated headers in SiteConfig to i18n'd (from r86429)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:47 +13:00
Ingo Schommer
a7c0797a9d FEATURE Import groups from CSV in admin/security through the new GroupImportForm class (and GroupCsvBulkLoader) (merged and rewritten from r98711)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Sean Harvey
b2d2220d22 MINOR Removed arguments to Hierarchy::getDescendantIDList() calls, as the method does not have any
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98341 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Sam Minnee
a17feb75fa BUGFIX: Fixed side report seelctor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
2ff2d28841 BUGFIX: More fixes renaming SSReport to SS_Report
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98218 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
a5753ad5ef API CHANGE: Removed SideReport class, use SSReport as the base-class for them instead.
API CHANGE: Use SSReport::register(SideReport) to explicitly register reports on the LHS of the content view.
BUGFIX: Updated all cms side reports to use SSReport as the base class. (from r95884)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
104171087b MINOR: Nicer date formatting (from r95761)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:32 +13:00
Tom Rix
80b35d15f2 MINOR fix permissions
FEATURE add 'view site tree as' functionality.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98025 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Sean Harvey
f3d0a4f54a BUGFIX Fixed incorrect logic in CMSMain::generateTreeStylingJS() stopping different tree icons from working
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98018 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00