Commit Graph

134 Commits

Author SHA1 Message Date
Sam Minnee
0e224a7daa Merge branch 'master' of git@github.com:sminnee/silverstripe-cms
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 01:53:49 +00:00
Sam Minnee
34ca1572d3 MINOR: Moved onAfterSave call for LeftAndMain decorators to be called
slightly later, so FormResponses can be overridden if necessary. (from r85614)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:44:29 +00:00
Sam Minnee
53d735c4f6 FEATURE SiteConfig (from r85339)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:33:14 +00:00
Ingo Schommer
a1a3b355d0 MINOR Explicitly allowing 'index' action in LeftAndMain and subclasses, due to api change in RequestHandler logic for $allowed_actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@86003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-10 01:38:29 +00:00
Tom Rix
2367de0758 MINOR fixed SiteTree search in admin
APICHANGE added onAfterSave in LeftAndMain

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-17 22:31:16 +00:00
Tom Rix
15d75ad293 FEATURE concurrent editing alerts. if two users are editing a page, the will get a notice. If Bob deletes/saves the page Alice is working on, Alice will be notified.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-12 21:19:04 +00:00
Andrew O'Neil
089483b2f4 NOTFORMERGE: Merged 84085 from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84090 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-10 04:34:17 +00:00
Tom Rix
96d438f21e ENHANCEMENT added new permission, SITETREE_REORGANISE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84073 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-09 22:29:45 +00:00
Sam Minnee
2d97200a23 BUGFIX: Removed Requirements::combine_files() reference to non-existent cms/javascript/FilterSiteTree.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-08 03:23:21 +00:00
Tom Rix
6a0f21ca05 ENHANCEMENT sitetree filters now show up in a dropdown, and you can add your own by extending CMSSiteTreeFilter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@83674 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-04 03:09:26 +00:00
Sam Minnee
037e73a8cb ENHANCEMENT: Dramatically improved performance of large-scale canEdit() and canDelete() checks, so that big sites can be supported in the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@83443 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-31 05:43:47 +00:00
Tom Rix
56281b7f3e MINOR prevent exceptions when the wrong object type is passed to LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@82488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-23 00:54:40 +00:00
Sam Minnee
92ff4e149b BUGFIX: Removed redundant template_templates setting that couldn't be overridden.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-10 03:56:39 +00:00
Sam Minnee
fece6769fe ENHANCEMENT Query ajaxExpansion on tree nodes without node limitation on serverside (see Hierarchy->markPartialTree()) to avoid "missing" nodes during the selection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81458 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 05:36:47 +00:00
Sam Minnee
7580c94b9a BUGFIX: Allow more style attributes in WYSIWYG editor so that all of the formatting buttons work.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-05 22:04:05 +00:00
Sam Minnee
2bd8782cdd MINOR ajshort: Removed call to deprecated Director site mode function.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-25 08:20:59 +00:00
Saophalkun Ponlu
5cfcf03d11 FEATURE: Single instance only page (in the site tree). OS ticket #1554
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-23 17:45:55 +00:00
Sean Harvey
5daa1033d9 MINOR Removed commented out line referencing tiny_mce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 02:05:01 +00:00
Ingo Schommer
3095172519 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@78169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-01 21:14:29 +00:00
Sean Harvey
8625e3bce3 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 05:31:22 +00:00
Sean Harvey
f27122e102 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77033 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 00:23:52 +00:00
Sean Harvey
c69994f98f Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77023 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 23:19:51 +00:00
Sean Harvey
b360ad9cd7 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76857 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:11:18 +00:00
Sean Harvey
a9ea6549c3 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75905 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-04 01:27:35 +00:00
Sean Harvey
4e4810bbb6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75780 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-30 22:47:28 +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
Ingo Schommer
8d61656c2e MINOR Changed formatting and documentation for classname change detection in LeftAndMain->save(), slightly adapted to new DataObject->newClassInstance() method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-27 05:58:54 +00:00
Ingo Schommer
310b75fce6 MINOR Using Translatable::choose_site_locale() instead of choose_site_lang() in LeftAndMain->init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@74072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-03 21:26:51 +00:00
Ingo Schommer
893df91e33 ENHANCEMENT Adjusted CMSMain and LeftAndMain to use locales instead of short lang codes when reading and writing translations. See r73468 for details on the underlying Translatable datamodel change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-20 08:49:27 +00:00
Ingo Schommer
a9053b4b67 BUGFIX Checking for existence of original before trying to get translation in LeftAndMain->currentPage()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73344 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 17:14:59 +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
Sean Harvey
3d4630a2c8 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71259 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 02:50:25 +00:00
Ingo Schommer
ad5471afdb BUGFIX Making sure that LeftAndMain->CurrentPage() respects language settings - was returning pages in different language from session after switching between languages in cms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70324 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-19 00:26:02 +00:00
Ingo Schommer
84f6f5d396 BUGFIX Fixed expanded/unexpanded flags on new tree items - was showing expanded styling (plus icon) with newly created pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70323 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-19 00:11:08 +00:00
Ingo Schommer
300435fb13 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:36:30 +00:00
Ingo Schommer
7b3068ac4f MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69703 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 06:17:59 +00:00
Ingo Schommer
3c8e45f65a MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@67466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:58 +00:00
Sam Minnee
f067bd1304 Adding double-quotes to table and field references
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66417 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 22:58:18 +00:00
Sam Minnee
a93a0c3c95 Updated SQL queries to be ansi compatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 00:31:13 +00:00
Sam Minnee
2ee0c0991b Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:50 +00:00
Sam Minnee
f44d7e00bf Added livequery to leftandmain install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65718 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 22:28:24 +00:00
Sam Minnee
c2fe5b15ae FEATURE #594: Added javascript-on-demand support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 04:31:53 +00:00
Ingo Schommer
62a36c6828 ENHANCEMENT Added LeftAndMainDecorator
API CHANGE Deprecated DataObjectDecorator->augmentInit(), use LeftAndMainDecorator->init()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65454 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 12:21:10 +00:00
Sam Minnee
750353dcd6 BUGFIX #2630 - Removed notice-level error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65271 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 04:20:35 +00:00
Sam Minnee
c98c6c387e Added deprecation method for LeftAndMain::add_menu_item()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65252 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 02:28:11 +00:00
Ingo Schommer
bcfa95887f BUGFIX Only enforcing record-level permissions in LeftAndMain if passed ID is numeric to avoid breaking AssetAdmin with string-based IDs (regression from r65152). See #3017
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65213 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 13:53:11 +00:00
Ingo Schommer
6eadbbff7f ENHANCEMENT Updated LeftAndMain->getMenuTitle() to use classname as fallback if $menu_title is not defined - one less thing to specify in a minimalist ModelAdmin subclass
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65181 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 01:46:58 +00:00
Ingo Schommer
9bf3245939 BUGFIX Enforce permission checks in LeftAndMain and CMSMain through SiteTree->canView()/canEdit()/canAddChildren()/canPublish()/canDelete() (see #2701)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 14:56:36 +00:00
Ingo Schommer
386c586b38 BUGFIX Setting menu titles for CMSMenu items in LeftAndMain::init() to get translated values for the current user locale (see #2873)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-02 22:45:49 +00:00
Ingo Schommer
2cdf57053f FEATURE Added CMSMenu and CMSMenuItem and adjusted existing LeftAndMain subclasses to use new notation.See #2872 (thanks to hamish for the patch!)
API CHANGE Removed LeftAndMain::add_menu_item(), LeftAndMain::remove_menu_item(), LeftAndMain::replace_menu_item(), LeftAndMain::clear_menu()
MINOR Disabled LeftAndMainTest, now covered by CMSMenuTest

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65095 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-02 21:27:55 +00:00