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
2,505 Commits 29 Branches 403 Tags 28 MiB
a220d37e3b
Commit Graph

94 Commits

Author SHA1 Message Date
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
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
01373cf4af BUGFIX Disallow addition of members to groups with MemberTableField->addtogroup() when the editing member doesn't have permissions on the added member 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110859 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:47 +13:00
Ingo Schommer
473347dcfe BUGFIX Fixing default group selection in 'add member' dialog (in MemberTableField) (fixes #5836) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108099 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:45 +13:00
Ingo Schommer
b505c5540a MINOR Removed debug code in MemberTableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107525 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:44 +13:00
Ingo Schommer
6330e4ec4b MINOR Fixed phpdoc documentation (from r103384) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103386 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:28 +13:00
Ingo Schommer
a6db618c12 BUGFIX Using try/catch in MemberTableField->saveComplexTableField() similiar to parent implementation, which means trying to save a Member duplicate doesn't end up in a fatal error (fixes #5444) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103336 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:28 +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
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
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
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
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
Sam Minnee
7a1e8591c8 MINOR when you delete a user from a group, they are also removed from any sub groups. (from r87119) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98158 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:30 +13:00
Sam Minnee
c124dd23fa BUGFIX: Removed XSS holes (from r94822) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96822 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:18 +13:00
Sean Harvey
4e9d2c3663 BUGFIX Removed code that relied on deprecated functions in MemberTableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93707 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:05 +13:00
Sean Harvey
0dfa69146d MINOR Removed MemberTableField deprecated methods for adding fields - this should be done by implementing summary fields on a Member decorator instead 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93662 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:05 +13:00
Sean Harvey
9433580f95 MINOR Removed MemberTableField::setController() - this is now redundant from r92134 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92135 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:04 +13:00
Sam Minnee
185e30a750 BUGFIX Disallow addition of members to groups with MemberTableField->addtogroup() when the editing member doesn't have permissions on the added member (from r110859) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112797 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:02:47 +00:00
Sam Minnee
00ff9c4daf BUGFIX Fixing default group selection in 'add member' dialog (in MemberTableField) (fixes #5836) (from r108099) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112790 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:00:14 +00:00
Ingo Schommer
d402ca527a MINOR Removed debug code in MemberTableField (from r107525) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112610 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 03:57:05 +00:00
Sam Minnee
79133892f6 MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated (from r100484) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112078 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 02:10:28 +00:00
Sam Minnee
7ee0ad5fa6 BUGFIX Using try/catch in MemberTableField->saveComplexTableField() similiar to parent implementation, which means trying to save a Member duplicate doesn't end up in a fatal error (fixes #5444) (from r103336) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111662 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 06:14:56 +00:00
Sam Minnee
00a5a5bd5b Reverted r111624 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111625 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 05:52:58 +00:00
Sam Minnee
ba163b83ae MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated (from r100484) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111624 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 05:51:54 +00:00
Sam Minnee
65aa49d564 BUGFIX Setting default $groups in MemberTableField::AddForm() in addition to MemberTableField_Popup::__construct() - this was broken by r99777 (from r99993) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111617 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 05:47:08 +00:00
Ingo Schommer
01b02969f9 MINOR Fixed phpdoc documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@103384 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-23 00:11:32 +00:00
Ingo Schommer
ca7d87078f MINOR when you delete a user from a group, they are also removed from any sub groups. (from r87119) (from r98158) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102754 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-14 01:49:29 +00:00
Ingo Schommer
186e43e60b BUGFIX: Removed XSS holes (from r94822) (from r96822) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102682 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 03:59:09 +00:00
Ingo Schommer
129ab60ae7 BUGFIX Unsetting 'ID' parameter in MemberTableField->addtogroup() to avoid confusion between Group and Member records (regression from r100716) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@100720 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-03-09 20:28:59 +00:00
Ingo Schommer
4eed1360c4 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) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@100716 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-03-09 08:42:54 +00:00
Ingo Schommer
9c75acb113 MINOR Fixed MemberTableField regression from r99706 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99710 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-23 04:55:09 +00:00
Ingo Schommer
7e6dfe14f5 BUGFIX Fixed MemberTableField limiting of , wasnt taking children groups into account (regression from r99684) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99706 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-23 04:43:25 +00:00
Ingo Schommer
fa04f03b0f BUGFIX Setting ID explicitly in MemberTableField-> to ensure getCsvQuery() correctly filters (the custom group filter was only implemented in sourceItems() before) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99684 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-23 03:30:46 +00:00
Ingo Schommer
ca3b8d5792 ENHANCEMENT Saving group relations on SecurityAdmin->EditForm()/RootForm() through TreeMultiselectField instead of hidden 'Group'/'GroupID' values 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99579 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-22 04:36:36 +00:00
Ingo Schommer
d68bbc2c01 MINOR Fixed height of MemberTableField 'Groups' tab to allow enough room for TreeMultiSelectField expansion 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98883 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-12 04:01:49 +00:00
Ingo Schommer
fc8f4130c2 ENHANCEMENT Saving MemberTableField through new 'Groups' field added in Member->getCMSFields(). 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98882 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-12 04:01:48 +00:00
Ingo Schommer
1ba1c563a8 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'))

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-11 21:55:33 +00:00
Ingo Schommer
e56852dcd8 ENHANCEMENT Adjusted SecurityAdmin to new LeftAndMain API and jquery.concrete javascript. Changed 'delete' and 'create' interface to be more in line with CMSMain parent implementation, and increase code reuse. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92831 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:20:17 +00:00
Ingo Schommer
64d74e043b MINOR Fixed merge error from r91584 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91593 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-15 20:43:08 +00:00
Ingo Schommer
ceeb9dfcc3 API CHANGE Removed deprecated MemberTableField->addMembershipField() and MemberTableField->addPermissions(), use TableListField->setPermissions() instead 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91584 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-15 19:36:53 +00:00
Sean Harvey
42a6692d79 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75592 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 01:44:28 +00:00
Sam Minnee
550931c02a Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72801 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-10 21:59:19 +00:00
Andrew O'Neil
fa76e64d48 Merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72452 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-04 03:35:29 +00:00