Commit Graph

619 Commits

Author SHA1 Message Date
Ingo Schommer
413b73dc0d MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
0518e205c7 API CHANGE: Made batch actions pluggable through CMSBatchActionHandler::register()
ENHANCEMENT: Added batch actions for unpublish and delete from published.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76666 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
812fad5964 BUGFIX: Fix modeladmin scrollbars in ie7
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sam Minnee
b2aa86140a API CHANGE: Made ModelAdmin's configuration statics public rather than protected, so that they can be accessed with Object::get_static()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sean Harvey
f2aa215cce BUGFIX Ensure that template path comments don't make it into ViewArchivedEmail
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sam Minnee
2414eb30cc ENHANCEMENT: Added page location fields in the behaviour tab, as an alternative to drag and drop
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Will Rossiter
fbac34c7c7 BUGFIX: set when ajax is disabled for commenting that we redirect manually down to the comment form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sam Minnee
820d6b92cd ENHANCEMENT: Added 'show deleted pages' function to CMS, with a restore page option.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:17 +13:00
Ingo Schommer
f34259148c MINOR Merged Translatable fixes from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sean Harvey
15f18179d4 BUGFIX Fixed PageCommentInterface $this->class being NULL because parent::__construct() wasn't called
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sam Minnee
62f9202c00 BUGFIX: Fixed refactoring of getRecord() so that it can handle currentPage() calls properly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sam Minnee
d33c2869a7 BUGFIX: Let CMS users open pages deleted from draft; bug introduced by translatable.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sam Minnee
7e64e2e7e8 BUGFIX #3740: Fixd duplicate tab highlight in ModelAdmin, by moving back to old tabstrip.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:14 +13:00
Sam Minnee
e9f1a7e0c4 ENHANCEMENT #3920: Alllow searching within subfolders in Files and Images section
BUGFIX: Let users open the root folder in Files and Images section

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:14 +13:00
Andrew O'Neil
859cfe66bd FEATURE: Allow Title and Navigation Label to be searched separately
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:14 +13:00
Ingo Schommer
58da2f0b99 MINOR Partially merged r71388 from trunk - removed group filtering which wasn't implemented fully
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75026 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:13 +13:00
Sean Harvey
cd5ed8515d BUGFIX Fixed error if clicking the root of a sitetree in the CMS - affected the AssetAdmin and SecurityAdmin sections
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75023 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:13 +13:00
Ingo Schommer
74fad6a1d0 Merging refactored Translatable from trunk, and related changes to CMSMain
------------------------------------------------------------------------
r69959 | ischommer | 2009-01-11 01:15:30 +1300 (Sun, 11 Jan 2009) | 18 lines

Merged, debugged and enhanced Translatable patches from branches/translatable at r64523, r64523, 64523, thanks wakeless!
API CHANGE Changed Translatable schema from auxilliary tables (SiteTree_lang, SiteTree_lang_Live) to automatically filtered records on the original table (SiteTree, SiteTree_Live), using $Lang and $OriginalID properties. Incompatible update to old schema, migration script is in the works.
API CHANGE Removed Translatable::get_one(), Translatable::write()
ENHANCEMENT Simplified Translatable tree generation by using getSiteTreeFor() in CMSMain->createtranslation()
ENHANCEMENT Added AllChildrenIncludingDeleted(), augmentNumChildrenCountQuery(),  augmentAllChildrenIncludingDeleted(), augmentStageChildren() to Translatable class to allow for more stable tree generation.
ENHANCEMENT Moved definition of Translatable schema from augmentDatabase() to Translatable->extraStatics()
ENHANCEMENT Changes to the CMS language selection refresh the whole admin interface instead of the tree only. This way we can add a URL parameter ?lang=<lang> to /admin, which makes the specific language bookmarkable and reloadable. Changes to LangSelector.js
ENHANCEMENT Added fallback to ModelAsController->getNestedController() to fetch page with matching URLSegment but different language in case no page is found in the current language.
ENHANCEMENT Added helper methods to Translatable: getTranslation(), hasTranslation(), isTranslation(), findOriginalIDs()
ENHANCEMENT Getters and setters for Translatable->getOriginalPage() etc.
ENHANCEMENT Hooking Translatable into ModelAsController and ContentController initialization in order to call choose_site_lang()
ENHANCEMENT Simplified Translatable->augmentSQL(), augmentWrite() by not using auxilliary tables
ENHANCEMENT Showing clickable links for Translations in Translatable->updateCMSFields()
BUGFIX Modifying Hierarchy/SiteTree Children getters to accept optional "context" which can be used to set a language explicitly through the $Lang property, rather than implicitly reyling on the static Translatable::current_lang()
BUGFIX Fixed TranslatableTest to work with new datamodel
BUGFIX Temporarily disabled cookie/session selection in Translatable::choose_site_lang() until we have a good test suite for the side effects.
MINOR Added "untranslated" CSS styles to tree nodes and marking them as inactive/grey

------------------------------------------------------------------------
r70307 | ischommer | 2009-01-16 17:16:19 +1300 (Fri, 16 Jan 2009) | 2 lines

ENHANCEMENT Simplifying creation logic of new languages in CMS by reloading complete interface, rather than refreshing partial interface, language dropdown etc.
API CHANGE Removed CMSMain->switchlanguage()
------------------------------------------------------------------------
r70308 | ischommer | 2009-01-16 17:17:37 +1300 (Fri, 16 Jan 2009) | 2 lines

ENHANCEMENT Moved language selector in CMS above tree for better visibility, added padding and adjusted dropdown width
ENHANCEMENT Removed "Translating mode" status message above edit form - should be clear by the language dropdown above the CMS tree now
------------------------------------------------------------------------
r70322 | ischommer | 2009-01-19 13:09:55 +1300 (Mon, 19 Jan 2009) | 1 line

BUGFIX Ensuring that new pages can't be created when in translation mode by disabling the "create..." tree action
------------------------------------------------------------------------
r70323 | ischommer | 2009-01-19 13:11:08 +1300 (Mon, 19 Jan 2009) | 1 line

BUGFIX Fixed expanded/unexpanded flags on new tree items - was showing expanded styling (plus icon) with newly created pages
------------------------------------------------------------------------
r70324 | ischommer | 2009-01-19 13:26:02 +1300 (Mon, 19 Jan 2009) | 1 line

BUGFIX Making sure that LeftAndMain->CurrentPage() respects language settings - was returning pages in different language from session after switching between languages in cms
------------------------------------------------------------------------
r71297 | sharvey | 2009-02-03 18:12:42 +1300 (Tue, 03 Feb 2009) | 1 line

BUGFIX Only show the LangSelector dropdown if there's multiple languages available on the site
------------------------------------------------------------------------
r73343 | ischommer | 2009-03-19 06:14:02 +1300 (Thu, 19 Mar 2009) | 1 line

BUGFIX Changed CSS selector for TranslationTab javascript behaviour to be less specific
------------------------------------------------------------------------
r73344 | ischommer | 2009-03-19 06:14:59 +1300 (Thu, 19 Mar 2009) | 1 line

BUGFIX Checking for existence of original before trying to get translation in LeftAndMain->currentPage()
------------------------------------------------------------------------
r73345 | ischommer | 2009-03-19 06:18:52 +1300 (Thu, 19 Mar 2009) | 3 lines

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
------------------------------------------------------------------------
r73469 | ischommer | 2009-03-20 21:49:27 +1300 (Fri, 20 Mar 2009) | 1 line

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
------------------------------------------------------------------------
r74071 | ischommer | 2009-04-04 10:24:59 +1300 (Sat, 04 Apr 2009) | 1 line

BUGFIX Fixed Form_EditForm_Locale reference in LeftAndMain_right.js (used to be Form_EditForm_Lang)
------------------------------------------------------------------------
r74072 | ischommer | 2009-04-04 10:26:51 +1300 (Sat, 04 Apr 2009) | 1 line

MINOR Using Translatable::choose_site_locale() instead of choose_site_lang() in LeftAndMain->init()
------------------------------------------------------------------------
r74951 | ischommer | 2009-04-22 16:23:56 +1200 (Wed, 22 Apr 2009) | 1 line

BUGFIX Fixed CMSMainTest->testThatGetCMSFieldsWorksOnEveryPageType() - was comparing a string $class with instanceof() instead of comparing the actually created instance
------------------------------------------------------------------------



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74988 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:13 +13:00
Sean Harvey
33ce4d8824 BUGFIX Fixed newly created Group records in SecurityAdmin not having "admin/security/show/" link by adding missing site tree handlers in SecurityAdmin_left.js
MINOR Reworked SecurityAdmin->SiteTreeAsUL() code to be tidier and easier to understand
BUGFIX Fixed ajax deletion of Group records properly - the site tree items didn't disappear immediately after deleting

MINOR Removed AssetAdmin->returnItemToUser() as it does the same thing as the parent class' LeftAndMain
MINOR Removed unused AssetAdmin_left.js and AssetAdmin_right.js Requirements calls in AssetAdmin - these files no longer exist



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:12 +13:00
Ingo Schommer
119f821b94 BUGFIX Moving Requirements for AssetTableField, CommentTableField and MemberTableField from __construct() into FieldHolder() and renderWith(), which means inclusion closer to render time, and less side-effects by a previous Requirements::clear(), e.g. in a CTF popup. See r74919
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:12 +13:00
Normann Lou
44fcc58c35 APICHANGE: add documentation to changeset r74858.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:12 +13:00
Normann Lou
900595c80d APICHANGE: pass argument $includerelations into DataObject::fieldLabels() default as true;
APICHANGE: BulkLoader::getImportSpec() call DataObject::fieldLables() with $includerelations as false, so that the relations is separated from column fields

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:12 +13:00
Sean Harvey
7402387e48 BUGFIX Added missing "Created" and "LastEdited" fields to the MemberTableField export fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:11 +13:00
Sean Harvey
3b59294763 BUGFIX Search filter should retain the existing query instead of removing it after each search in MemberTableField and CommentTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:11 +13:00
Sean Harvey
5b993b9990 BUGFIX Fixed issue with StaticPublisher->onAfterWrite() failing because of incorrect arguments to Versioned::get_by_stage()
MINOR Fixed undefined variable error if $urls doesn't exist and tries to loop through the non-existant array in StaticPublisher->onAfterWrite()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:11 +13:00
Will Rossiter
c9b67367e6 MINOR: fixed minor isset() issues when no groups exist
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74074 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:11 +13:00
Saophalkun Ponlu
99129cfadd MINOR: notify file obejct after uploading
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:10 +13:00
Sean Harvey
d08562661e BUGFIX Using $allowed_actions in ImageEditor (Merged from r73248)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:09 +13:00
Sean Harvey
5ed106ea84 UGFIX Using auto-escaped get_by_id() in CommentAdmin and SecurityAdmin (Merged from r73247)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73283 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:09 +13:00
Sam Minnee
cd6a6ad92d BUGFIX: Fixed ajax-response for multiple-item deletion
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:08 +13:00
Sam Minnee
f18ace08b7 BUGFIX #3715: Removed spurious change detection in files and images section
BUGFIX: #3715: Show the changes message in a popup instead of a blank confirm box

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:08 +13:00
Sam Minnee
e1ce3dff46 BUGFIX #3714: Added default value to modeladmin search button
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:08 +13:00
Will Rossiter
6b0ab830dd BUGFIX: redirect user down to their posted comment if it was not posted via AJAX
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73016 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:08 +13:00
Will Rossiter
5e5a06d8e9 MINOR: fixed whitespace issue and added SessionID to page comment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72903 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:08 +13:00
Andrew O'Neil
27bfe60a33 BUGFIX: #3596 - Creating more than one new folder causes infinite loop (hamish)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72852 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:08 +13:00
Andrew O'Neil
de375ae0a2 BUGFIX: #3645 - CommenterURL missing from CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:07 +13:00
Andrew O'Neil
0a7431a0ff BUGFIX: #1450 - Passwords should be obscured when adding a member in a MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:07 +13:00
Andrew O'Neil
565ca59b57 MINOR: #3646 - Change default application link to direct to http://www.silverstripe.org instead of http://www.silverstripe.com
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72792 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:07 +13:00
Will Rossiter
8c27499cd0 FEATURE: added ability to disable AJAX commenting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:07 +13:00
Sam Minnee
39f7d47b84 BUGFIX #3590: Allow subclassing of Folder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72693 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:06 +13:00
Sam Minnee
af0519b198 BUGFIX: Include i18n where necessary. 2nd part of r72563
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72564 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:06 +13:00
Sean Harvey
e17d88dcc3 MINOR Allow setting page size for MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:06 +13:00
Will Rossiter
7a027eb753 BUGFIX: fixed site page restoration
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:05 +13:00
Sam Minnee
9086994807 BUGFIX #3441 funkygibbon: Stop ThumbnailStripField breaking on orphaned images
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:04 +13:00
Normann Lou
d04e908358 ENHANCEMENT: Ticket 2756: Newsletter performance problem, run out of memory.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70956 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:04 +13:00
Sean Harvey
e08fc1e0e5 ENHANCEMENT Export to CSV data of MemberTableField gets all fields on the member from the db array, instead of just FirstName, Surname and Email
MINOR Code formatting fix

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:04 +13:00
Ingo Schommer
b423bbe5e0 BUGFIX Disabled inline "create folder" and "upload" for anything but Flash Player 9 - versions below have general compatibily issues, versions above (Flash Player 10) have new security restrictions around file dialogues which require an SWFUpload upgrade (see #3023)
ENHANCEMENT Allowing setting of foldername in AssetAdmin->addfolder() to simplify the inline "create folder" logic (doesn't need to send of a fake ajax form-save from CMS into /admin/assets just to save the folder name) (see #3412)
ENHANCEMENT Removed BrowserDetect javascript library which was randomly placed in Security_login.js and just included in AssetAdmin. Reverted to regex-matching for simple browser detection for now
BUGFIX Fixed "cancel" button for inline "create folder" functionality (was not stopping event in IE7)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:04 +13:00
Normann Lou
efbdaf7b2e Undoing change committed in r 70734
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Normann Lou
20e829a6be git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70734 467b73ca-7a2a-4603-9d3b-597d59a354a9 2011-02-02 17:48:03 +13:00
Andrew O'Neil
c7a03db6e7 BUGFIX: Add EditForm to list of allowed actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70729 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00