Commit Graph

984 Commits

Author SHA1 Message Date
Sam Minnee
cd497a6cee MINOR: Fix to ModelAdmin, part of r103519 (from r103533)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:18:29 +00:00
Sam Minnee
532166f4f5 BUGFIX: put back into the SSNavigator the archived site link (#5251) (from r101623)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:15:18 +00:00
Sam Minnee
5b15f9e9e9 MINOR Improved help texts around permissions (from r100783)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:12:59 +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
75964b85d7 MINOR: add more in-line documentation and fix the typo: should => should not (from r103520)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:16:50 +00:00
Sam Minnee
f55968789b BUGFIX: Prevent duplicate HTML IDs in ModelAdmin (from r103519)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111667 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:16:40 +00:00
Sam Minnee
26f987e67f BUGFIX Fixed redirection in PageCommentInterface to use Link() instead of URLSegment (fixes 4200, thanks ktauber) (from r103518)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111666 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:16:23 +00:00
Sam Minnee
81318288c5 ENHANCEMENT: to make the FileIFrameField and TreeSelectionField easy to use in CMS with Translatable on. (from r103465)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111665 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:16:17 +00:00
Sam Minnee
a447f71a10 MINOR Fixed phpdoc documentation (from r103397)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111664 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:16:03 +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
cdfbc8a604 BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme. (from r103255)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:14:49 +00:00
Sam Minnee
5926dcc234 BUGFIX: realtime publishing now enabled by default (from r103127)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:14:31 +00:00
Sam Minnee
9c9a42bf89 BUGFIX: correct mollom field mapping (from r103037)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111658 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:14:17 +00:00
Sam Minnee
ec63a1092f MINOR: reverted wrong change (from r102901)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111657 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:14:05 +00:00
Sam Minnee
fd6a0f8fd3 ENHANCEMENT: added language (Ticket #5390) (from r102899)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111656 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:13:58 +00:00
Sam Minnee
9b2e9b6164 BUGFIX Fixed CTF sorting in ModelAdmin results (was failing because of missing 'ResultAssembly' GET parameters (from r102712)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111655 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:12:50 +00:00
Sam Minnee
b85dab39ce BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364) (from r102386)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:12:42 +00:00
Sam Minnee
3a7b510127 BUGFIX #5255 LeftAndMain should include the correct editor.css file so typography from user selected theme in SiteConfig is shown in TinyMCE (from r102038)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111651 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:12:19 +00:00
Sam Minnee
171b16e6c9 BUGFIX: keep ModelAdmin from importing data twice (from r101795)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111646 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:10:33 +00:00
Sam Minnee
dea5cdd64e MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields (from r101752)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111645 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:10:22 +00:00
Sam Minnee
fc50b2df08 BUGFIX RedirectorPage types shouldn't appear in "Pages with no content" side report in the CMS Pages tab (from r101737)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111644 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:09:26 +00:00
Sam Minnee
261b4b9a6c BUGFIX Only show "Roles" tab in admin/security if user has APPLY_ROLES permissions (fixes #5258) (from r101719)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:09:10 +00:00
Sam Minnee
f00a0a1570 BUGFIX: Make SS_ReportWrapper::sourceRecords()' arguments optional (from r101189)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111641 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:07:24 +00:00
Sam Minnee
18add377f2 MINOR Fixed wrong default value for AssetAdmin (see r101106) (from r101111)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111637 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:07:04 +00:00
Sam Minnee
c49b38f615 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review. (from r101106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111636 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:06:57 +00:00
Sam Minnee
da16a507ae MINOR: Use castingHelper() rather than castingHelperPair() to look for a field presence. (from r101091)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111635 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:06:50 +00:00
Sam Minnee
8ea6dddba5 MINOR Fixed permission language code regression (from r101062)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111633 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:06:32 +00:00
Sam Minnee
5176cdd4f0 MINOR Adjusted CMSMain->getRootForm() to SiteConfig API changes (from r100974)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:06:15 +00:00
Sam Minnee
f8f18f40aa Several merges from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:04:21 +00:00
Sam Minnee
7945c46b49 BUG FIX: column names quoted properly (from r100688)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111628 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:15 +00:00
Sam Minnee
75c64136ad MINOR Removed underscores from combined files in LeftAndMain, made redundant by r100536 (from r100537)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111627 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:08 +00:00
Sam Minnee
f04470ddf0 MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php (from r100530)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:53:25 +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
cb5cb90889 BUGFIX #5135 LeftAndMain extra requirements loading for "themedcss" should use Requirements::themedCSS() not Requirements::css() - thanks Hamish! (from r100394)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:49:33 +00:00
Sam Minnee
2010923fe2 MINOR add extendability to SecurityAdmin (from r100360)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:49:00 +00:00
Sam Minnee
d41d84c3e6 ENHANCEMENT: allow ordering of page commented to be configurabled (from r100327)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111619 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:47:38 +00:00
Sam Minnee
70105f066e ENHANCEMENT AssetAdmin now uses Upload_Validator instead of setting the rules directly on Upload (from r100058)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:47:30 +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
Sam Minnee
a1cbf0cddf BUGFIX: Use underscores in names of combined .js (#3581) (from r99887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:46:09 +00:00
Sam Minnee
325a57eea6 BUGFIX #5073: Fixed CMS version indicator for alpha and beta versions. (from r99789)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:46:01 +00:00
Sam Minnee
d98563e80d MINOR add pass thru group and sort methods (from r99497)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:41:57 +00:00
Sam Minnee
aa6e1c3341 BUGFIX: Correct StaticPublisher filenames, now works with nested URLS (from r99465)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:35:19 +00:00
Sam Minnee
f60941648b MINOR Moved timezone coupling in SS_Report labels into timezoneawareness module (from r99178)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:33:42 +00:00
Sam Minnee
405a9c4563 MINOR Localized reports (from r99137)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111610 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:32:22 +00:00
Sam Minnee
994e60aea8 BUGFIX: Fix not being able to print/export reports (from r98684) (from r99128)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:31:35 +00:00
Sam Minnee
b1cc843801 MINOR: Bugfix in previous commit (from r98660) (from r99127)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:29:53 +00:00
Sam Minnee
c8f22503fc BUGFIX: Fixed cache prepopulation on sitetree load. (from r98651) (from r99125)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111606 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:29:34 +00:00
Sam Minnee
4c510624b1 APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161) (from r99119)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111604 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:27:08 +00:00
Sam Minnee
201e6a5d7c ENHANCEMENT batchactions can now implement confirmationDialog() to provide a custom confirmation dialog to the front end.
MINOR added above confiration to batch setting expiry (from r97215) (from r98211)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:25:44 +00:00