Commit Graph

602 Commits

Author SHA1 Message Date
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
Saophalkun Ponlu
12bd84481c Merged patch submitted by ajshort that calls loadDataForm on a newly created object in ModelAdmin so that properties of the object are loaded properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Will Rossiter
5759314893 BUGFIX: show flash icon and box if flash file exists. MINOR: created a default editor.css file which has base css styles for the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
James Kirkus-Lamont
c15b86a86e BUGFIX: cms ui added colon to image upload prompt (inline with other step)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70683 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Sean Harvey
39b10d2923 MINOR Code formatting for delete unused thumbnails functionality
MINOR Use FormResponse instead of echoing strings as JS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:02 +13:00
Ingo Schommer
a48a119bcc MINOR merged r70323 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:01 +13:00
Will Rossiter
fe4e18bc0e MINOR: merged patch from keeny. Put comment data into Cookie and load if user fails maths spam question. Clear comment cookie on successful posting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:57 +13:00
Will Rossiter
1c7895683f MINOR: added empty statics to PageComment to allow for decoration
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70408 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:56 +13:00
Will Rossiter
59d89be316 MINOR: removed Gallery Module code from AssetTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:55 +13:00
Sean Harvey
bf200c86b8 MINOR Removed redundant code from MemberTableField
MINOR Code tidy up and coding style fixes for MemberTableField


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70236 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Normann Lou
9f406531b7 BUGFIX: due to changeset 65289 by phalkunz, the ImportForm() and import() functions need to move from CRMAdmin class to CRMAdmin_CollectionController class, fix relative bugs by the move.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Normann Lou
ec6282c808 FEATURE: add permission control for AddForm and EditForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70142 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Sean Harvey
dd61569d6c ENHANCEMENT Creation of a new page type now uses a consistent source of classes that respect $hide_ancestor on SiteTree.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Sean Harvey
ba854a960e BUGFIX Removed ANSI compatible SQL that shouldn't be in branches/2.3 - this feature is available in trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70077 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sean Harvey
9b84e9df6f MINOR Removed redundant code in CMSMain->AddPageOptionsForm()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sean Harvey
8f22f4ffc3 ENHANCEMENT Default to "Page" for new page type dropdown
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Normann Lou
6b5cab8dab MINOR: fix on-line documentation syntax so that phpDocumentor can creating automatically the API doc
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sam Minnee
db9b53d786 BUGFIX: Added page-limiting back to CMS tree querying
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69986 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00