Commit Graph

568 Commits

Author SHA1 Message Date
Sean Harvey
d82ba048bf Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79439 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 11:50:02 +00:00
Sam Minnee
02d9dd60e7 MINOR ajshort: Updated CMSMenu to use Object::get_static() to get configuration information.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79361 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 10:40:39 +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
a3f3374205 BUGFIX Don't throw array error when no result columns are selected in ModelAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@78425 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-04 21:12:16 +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
Ingo Schommer
a1f8fb3049 BUGFIX Fixed quoting in WidgetAreaEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77991 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-27 21:26:07 +00:00
Ingo Schommer
40a2c3bb7c ENHANCEMENT Support for DataObject->validate() and ValidationException catching in ModelAdmin->doSave()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 06:01:36 +00:00
Sean Harvey
a1b04f1018 BUGFIX Ensure that CMSMainMarkingFilter::mark() always passes an integer into array_key_exists() or it will break
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 04:06:33 +00:00
Will Rossiter
bf7b7d09e7 FEATURE: added ability to display comments even when comments have been disabled. #2081
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77806 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 01:56:07 +00:00
Sean Harvey
0e4cccb979 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 07:00:36 +00:00
Sam Minnee
646ed9342a BUGFIX: Fixed bugs in content differencer, and improved styling.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-23 03:30:57 +00:00
Sam Minnee
ef2c47feb8 BUGFIX: Fixed query syntax issues for db abstraction.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77556 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 05:11:14 +00:00
Sean Harvey
9207cbc2da Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77455 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 00:17:27 +00:00
Sam Minnee
8282a61ddf API CHANGE: Added record_controller and collection_controller as options that you can add to the managed_models array.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 10:03:11 +00:00
Rainer Spittel
fa69772112 ENHANCEMENT: encapsulated getResultsTable from ResultsForm in ModelAdmin_CollectionController
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77158 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-19 03:25:47 +00:00
Ingo Schommer
80d79e63b8 API CHANGE: Allowing ModelAdmin::$managed_models to contain additional options in their array values, e.g. a custom "title" (Improved #4036, see r76999)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 21:13:28 +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
Ingo Schommer
b62bb7ab77 MINOR Updated CMSMain to Translatable API changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77007 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 05:36:51 +00:00
Sam Minnee
eb7d4f0118 MINOR: Fixed managed_models error message to reflect that it's public, not protected, now.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 06:08:27 +00:00
Sam Minnee
7d00afce59 API CHANGE #4036 ajshort: Add the ability to set the keys of ModelAdmin::$managed_models to alternate titles for the tabs.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 06:03:22 +00:00
Sam Minnee
405392f7f7 API CHANGE #4036 ajshort: Add the ability to set the keys of ModelAdmin::$managed_models to alternate titles for the tabs.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76998 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 06:02:57 +00:00
Sam Minnee
4adb585e80 ENHANCEMENT ajshort: Add the ability to overload getModelForms() and add new custom model sidebars.
API CHANGE: Move the generation of the content for the create / search / import model sidebar from ModelAdmin into the collection controller.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 05:58:54 +00:00
Sean Harvey
b34dcd40b0 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-15 00:13:11 +00:00
Ingo Schommer
491118381c MINOR Package documentation for CMSBatchAction* classes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76878 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 21:56:35 +00:00
Sean Harvey
46bf3ce2d2 Added missing classes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76876 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 21:51:54 +00:00
Ingo Schommer
8362026b12 BUGFIX Fixed CMSMain->LangSelector() default language selection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 21:27:10 +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
Ingo Schommer
7fc439dcd3 MINOR Adapted to API change in r76853 (Translatable::get_current_locale())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:06:34 +00:00
Ingo Schommer
e99ef98e89 ENHANCEMENT Using standard LanguageDropdownField in CMSMain->LangSelector()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 05:18:37 +00:00
Ingo Schommer
9da24cdfb5 BUGFIX Removed obsolete CMSMain->EditingLang(), not used any longer (see #3997)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-13 06:02:31 +00:00
Sean Harvey
182d1061a9 Merged from 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 06:37:45 +00:00
Sean Harvey
892849c0e1 BUGFIX Fixed saving of widgets correctly if ID is not numeric
MINOR Code formatting fixes



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 03:31:15 +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
504ba464f6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75655 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 05:56:33 +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
Sean Harvey
2680489318 BUGFIX Fixed issues with StaticPublisher->onAfterWrite() - merged from r74092
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@74093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-06 01:28:03 +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
Normann Lou
f1d9428c58 Roll back chane commited in r73700
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73706 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-26 20:48:25 +00:00
Normann Lou
dfff676f48 1. Add Data model for DrawDivisionPrize and Lot (LotNumberBased, LotTicketBase). 2.Add model admin for DrawCenter. 3. Disable create a game draw for draw center.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73700 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-26 04:53:23 +00:00
Normann Lou
031b88d0f3 ENHANCEMENT: make the currentRecord of ModelAdmin_RecordControll accessible by adding ModelAdmin_RecordControll::geCurrentRecord(), this is to fix bugs for those ComplexTableField fields generated automatically by relations.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-24 06:17:21 +00:00
Ingo Schommer
c66ebfaeb8 MINOR phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-22 22:58:18 +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
15454352bb ENHANCEMENT Showing all available languages in language selector above sitetree in CMS - you can now create new pages in completely new languages without any relation to an "original"
ENHANCEMENT Added CMSMain->IsTranslatableEnabled
API CHANGE Removed CMSMain->switchlanguage() - createTranslation() is sufficient for new, ajax refreshing of CMS state got way too complicated for switching languages, we now just reload the entire CMS with a different ?lang GET parameter

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73345 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 17:18:52 +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
Ingo Schommer
caa961e4fb MINOR ModelAdmin documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73337 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 14:13:03 +00:00
Ingo Schommer
be985afd24 API CHANGE Using RequiredFields or DataObject->getCMSValidator() in CMSMain->getEditForm(), which means all pages in the CMS will have validation enabled, e.g. for date fields. This is necessary to avoid a global disabling of javascript validation through Validator::set_javascript_validation_handler('none') breaking the CMS, which relies on javascript responses through Form->validate() and the FormResponse class (without specifically requesting them through HTTP Accept headers). See #3386 and #2915
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73336 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 13:03:52 +00:00