Commit Graph

514 Commits

Author SHA1 Message Date
Ingo Schommer
12dc778cf5 ENHANCEMENT Disallowing CMSMain->revert() if SiteTree->canPublish() is not granted (used to be SiteTree->canEdit()). If a user isn't allowed to publish, he shouldn't be allowed to revert the live state of a page either.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Ingo Schommer
832cd7c1e9 ENHANCEMENT Moving "save" and "delete" cms actions from CMSMain->EditForm() into SiteTree->getCMSActions() to make them decoratable (e.g. disallow delete action) and easier to cover with unit tests. Leaving fallback "save" and "delete" actions in CMSMain in case no actions are defined (necessary e.g. for Group class in SecurityAdmin)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67061 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Sam Minnee
fc14227238 BUGFIX: Fixed warning on AssetAdmin (merged from trunk)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
13d0f09717 ENHANCEMENT Just redirect back after "import" action called, and set the session message on the Form object instead of hardcoded ID
MINOR phpDoc comments for ModelAdmin->import()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
02be93a3ca MINOR Added code example of $model_importers array item
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
7db5f7b2e9 BUGFIX Fixed importer not working because of i18n_singular_name(), just use the class name of the model instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
45c0564c9d BUGFIX Made use of Convert::raw2att() before returning the ModelName for Import spec fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
811cdb66a3 BUGFIX Fixed "Show specification..." link not working because ModelName had spaces in it
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66791 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Ingo Schommer
96f6ffb74c BUGFIX Only including ModelAdmin->ImportForm() if an actual importer was specified
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Saophalkun Ponlu
8bff580b44 MINOR Reverted reference to jquery-packed.js which causes problems by double minification in cms (see r66735)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:41 +13:00
Saophalkun Ponlu
a4b3b95872 MINOR: fixed path include for jquery
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66735 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:41 +13:00
Sam Minnee
70ad5368cd BUGFIX: Fixed redirection to help page bug that intermittently appears
BUGFIX: Add LeftAndMain:$url_rule to minimise bugs in modules

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:41 +13:00
Sean Harvey
21fa7b24f7 MINOR Removed unused action "waitingon" from CMSMain::$allowed_actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
d1ed61a5f4 MINOR Removed TaskList remnants of old cms workflow code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66642 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sam Minnee
856e01b156 Allow passing of columns to ColumnSelectionField() and allow different ColumnSelectionField() values to influence the result columsn
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
b1218f85da MINOR Readd of end php tag as per coding conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
2c1374a35d MINOR Added missing end php tag for ImageEditor, as per coding conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
42c40aeba3 MINOR Removed whitespace after end php tag for AssetTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
43598d35e1 MINOR Added php end tag to AssetAdmin, coding conventions
MINOR Fixed tabbing for various functions
MINOR Removed commented out code that shouldn't be lying around

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Ingo Schommer
dde4a07058 ENHANCEMENT Optionally getting all columns in ModelAdmin->getResultColumns() - not just the columns ticked in the UI (useful for CSV export)
ENHANCEMENT Defaulting to show all columns in ModelAdmin CSV export, ignoring user selection of result table columns (users can always limit CSV columns by manually deleting them e.g. in Excel)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66596 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Andrew O'Neil
3aa7ad3212 Fix incorrect logic in r66544
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66546 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Andrew O'Neil
cc982ec915 Make sure only fields that exist can be autocompleted on MemberTableFields, and never autocomplete on password.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66544 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Normann Lou
018e153197 APICHANG: if a DataObject has getCMSActions, its model admin should be able to add them.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:39 +13:00
Sean Harvey
0b1392a688 MINOR SecurityAdmin code formatting cleanup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:39 +13:00
Sean Harvey
4a60bb53d9 MINOR Removed old references to "rightbottom", which is now obsolete and caused a big box to appear in the CMS sometimes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:39 +13:00
Sam Minnee
cad3903459 Fix to LeftAndMain to ensure that jquery doesn't break other admin sections
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66350 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:39 +13:00
Sean Harvey
77ea25ca07 MINOR Removed old workflow instances in the cms module. See ticket #3044
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66310 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:38 +13:00
Ingo Schommer
6a21094048 BUGFIX Improved reliability of LeftAndMain->CMSVersion() - not failing on empty $URL$ placeholder with subversion path to determine version numbers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66274 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:38 +13:00
Sam Minnee
45c4d670b6 API CHANGE: Revamped CMSMenu system to not instantiate any objects, so that _config.php doesn't get fskd
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:38 +13:00
Ingo Schommer
8bc9fa1723 MINOR Fixed class naming in LeftAndMainDecorator.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Andrew O'Neil
53f59b6593 FEATURE #1531 - Allow moving files in root assets file (hamish)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66163 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Ingo Schommer
5c97a59a5c BUGFIX Disabled js code in CMSMain->switchlanguage() which was assuming wrong DOM structure (TODO: Replace with more robust selectors)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66136 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Will Rossiter
2a309755d9 Merged pre-2.3-oct08 into branches/2.3 (via trunk)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Sam Minnee
325ef6fe34 BUGFIX #3065: Fixed restore page
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Sam Minnee
555ee1549b BUGFIX #3063: Allow old-school method of adding menu items to LeftAndMiain:
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Sam Minnee
0d00fcf798 BUGFIX #3073: Fixed LeftAndMain::deleteitems()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65944 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:36 +13:00
Sam Minnee
16d96c7f36 FEATURE #1614: Allow use of admin/addpage?ParentID=(ID)&PageType=(Class) url to quick-add pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65904 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:36 +13:00
Sam Minnee
f001eee5fe BUGFIX #2706: Fixed JS error in multi-nested pages deletion
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:36 +13:00
Sam Minnee
2738afa74e BUGFIX: Ensure that menu items of the same priority show the first added item closes to the left
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:35 +13:00
Sean Harvey
33467b2011 ENHANCEMENT Added error messages to flash uploader panel, to be consistent with the image uploader one
BUGFIX Fixed flash uploader not searching for the correct files, due to changes in r65820


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:35 +13:00
Sean Harvey
454fabf534 Merged in image search capabilities from trunk version - r65820, r65823
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65824 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:35 +13:00
Sam Minnee
9182bbb410 Fixed fatal error in CommentTableField:
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 02:18:49 +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
Normann Lou
7016541b65 APICHANGE: even when no results found, the HTTPResponse should return a "200" HTTPResponse rather than "404" HTTPResponse, otherwise, the right panel didn't refresh the result table, and the error message shows up.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 02:18:11 +00:00
Sean Harvey
827224b47f BUGFIX Removed offending $this->canEdit() which returned a boolean, not appropriate to be passed into Member::mapInCMSGroups()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-11 20:45:11 +00:00
Sam Minnee
d03e189f63 Replaced 300-second 'long execution' times with unlimited
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65529 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 05:06:08 +00:00
Sam Minnee
e28bfb2730 Merged branches/2.2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 04:07:03 +00:00
Ingo Schommer
7e072ad785 BUGFIX Fixed Translatable::default_lang() call in CMSMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:48:43 +00:00
Ingo Schommer
df7092163f ENHANCEMENT Using currently used content languages for options in the TinyMCE spellchecker (see http://open.silverstripe.com/ticket/2498#comment:2)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65513 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:47:13 +00:00