Commit Graph

251 Commits

Author SHA1 Message Date
Sam Minnee
b07e4e5181 MINOR: Fixed column escaping for PostgreSQL support.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89517 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-19 22:28:35 +00:00
Sam Minnee
9289de1319 BUGFIX: Removed SiteTree::rewriteLink() method that is no longer necessary due to the use of shortcodes.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89444 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-19 04:19:41 +00:00
Ingo Schommer
baf98e81d6 BUGFIX Respecting SiteTree->canDelete() in SiteTree->getCMSActions()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-17 05:11:23 +00:00
Ingo Schommer
613dbf55d0 BUGFIX Fixed SiteTree->validURLSegment() to perform a DataObject::get_one() instead of raw SQL, in order for decorated filtering (e.g. by the subsites module) to apply correctly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89236 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-16 00:31:39 +00:00
Sam Minnee
c1fb483890 MINOR: Removed debugging statement (from r89019)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:40:45 +00:00
Sam Minnee
aaeaf6ccb2 BUGFIX: Fixed image link rewriting and added a test. (from r89011)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:40:06 +00:00
Sam Minnee
e23023b8a9 ENHANCMENT improved reporting around broken links/files (from r88993)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:39:26 +00:00
Sam Minnee
e36798bc9b MINOR added batch deletion back for workflow (from r88916)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89201 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:36:26 +00:00
Sam Minnee
08166d902a MINOR notice fix (from r85379)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:32:48 +00:00
Sam Minnee
d9ec2b327f MINOR permission fix (from r85373)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89191 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:31:44 +00:00
Sam Minnee
ae24151fe5 FEATURE SiteConfig (from r85339)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89190 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:30:34 +00:00
Sam Minnee
1fed31cb9e #108 - Subsite Virtual Page ordering (from r84848)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:27:48 +00:00
Sam Minnee
500ce4a91d MINOR added better status reporting to batch actions. Will now report the correct number of pages actioned in the status message (from r88786)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:24:41 +00:00
Sam Minnee
425f5d278c MINOR: Hide readonly permission group fields on pages when not relevant,
as they are confusing. (from r88019)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:21:41 +00:00
Sam Minnee
4e6911610a FEATURE: Add another permission code that allows users to edit siteconfig without having admin priveleges (from r87261)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:20:39 +00:00
Sam Minnee
af2c0b0f34 BUGFIX: Fix broken link tracking of linked files (from r87252)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:20:11 +00:00
Sam Minnee
f84180813f #150 - Pages with similar content
#148 - Stable against restructures (from r87251)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:19:25 +00:00
Sam Minnee
d2cd852df4 BUGFIX: Fix image tracking to take resized images into account (from r86198)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:11:19 +00:00
Sam Minnee
567612bd16 MINOR can_edit_multiple fix
MINOR fixed ie6 prompt defect
MINOR track publish actions
MINOR dont reset workflow if it's sitting at AwaitingEdit on save. (from r86251)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:58:24 +00:00
Sam Minnee
438a51956a MINOR: Wording on permissions (from r85643)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89160 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:47:52 +00:00
Sam Minnee
4ab8055c29 #63 - Stable against restructures (from r84861)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:46:13 +00:00
Sam Minnee
5680cc97e6 MINOR: Properly quoted column name in SiteTree->validURLSegment() for postgresql support
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 10:31:19 +00:00
Andrew Short
8546a6d194 MINOR: Updated SiteTree->ElementName() to generate the identifier from the full link rather than the URLSegment.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:26 +00:00
Andrew Short
da4b65c749 FEATURE: Added RequestHandler->hasAction() and Controller->hasAction() to check if a specific action is defined on a controller.
ENHANCEMENT: Updated ContentController->handleRequest() to use Controller->hasAction() to check whether to fall over to a child page, rather than relying on an error response from Controller->handleRequest().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88505 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:23 +00:00
Andrew Short
ea906a50a8 FEATURE: Implemented Translatable::get_homepage_link_by_locale() to enable translated home pages to function.
FEATURE: Updated SiteTree::get_by_link() to integrate with translatable, and allow it to work across languages by implementing Translatable->alternateGetByLink().
API CHANGE: Moved lang_filter enabling & disabling into static methods on Translatable, and renamed to locale_filter.
BUGFIX: Fixed viewing a translatable page by URL without explicitly setting a Locale in ContentController->handleRequest().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88503 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:22 +00:00
Andrew Short
80c8780b6f ENHANCEMENT: Updated the SiteTree URLSegment conflict resolver to work with nested URLs.
MINOR: Added tests for SiteTree->validURLSegment().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:21 +00:00
Andrew Short
0ddef87117 ENHANCEMENT: Updated SiteTree CMS fields to be in line with nested URL changes.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88501 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:20 +00:00
Andrew Short
3a0f809387 MINOR: Removed link rewriting methods on SiteTree that are no longer necessary due to linking changes.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:18 +00:00
Andrew Short
ad7194cc40 FEATURE: Refactored RootURLController to allow nested home pages.
MINOR: Deprecated RootURLController::get_homepage_urlsegment() in favour of get_homepage_link().
MINOR: Updated SiteTree->RelativeLink() to return a link to the site root for the home page.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:17 +00:00
Andrew Short
bc143c8c1e MINOR: Updated SiteTree->generateURLSegment() to trim the link of dashes before returning.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:12 +00:00
Andrew Short
cb35b13905 ENHANCEMENT: Updated the SiteTree link and section code to derive data from the current page, rather than relying on its own cache.
MINOR: Added tests for the link and section code.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:11 +00:00
Andrew Short
bf50f560df ENHANCEMENT: Update ContentController to manually set the current Director page in handleRequest().
MINOR: Deprecated Director::currentPage() in favour of Director::get_current_page().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:10 +00:00
Andrew Short
d4fb917825 MINOR: Replaced usage of the deprecated SiteTree::get_by_url() with get_by_link().
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:08 +00:00
Andrew Short
57f9a957bc FEATURE: Added SiteTree::get_by_link() to fetch the SiteTree object associated with a nested link.
MINOR : Deprecated SiteTree::get_by_url().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:08 +00:00
Andrew Short
4a054c0cc5 FEATURE: Allow you to link to SiteTree? objects in HTMLText or HTMLVarchar fields by using a "[sitetree_link id=n]" shortcode.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88481 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:04 +00:00
Andrew Short
3599a105fd ENHANCEMENT: Updated SiteTree linking methods to generate nested URLs.
MINOR: Updated ContentController->Link() to force links generated by a controller to always be returned in their full form.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88476 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:00 +00:00
Andrew Short
bd5b134c37 FEATURE: Added utility methods to enable and disable nested URLs to SiteTree.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:54 +00:00
Geoff Munn
5c0b83f046 MINOR FIX: columns quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86511 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-17 00:08:21 +00:00
Geoff Munn
664aaacb21 MINOR FIX: column names quoted properly, full text search column now named
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-13 22:27:47 +00:00
Geoff Munn
95e50bd78f MINOR FIX: column names quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85418 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-31 00:21:46 +00:00
Ingo Schommer
42d12d75b8 MINOR Wording
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-30 20:59:32 +00:00
Ingo Schommer
fec369531c MINOR Added SiteTree::reset() to unset any in-memory caches (see DataObject::reset()). Using reset() in SapphireTest to avoid caches persisting across multiple tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85337 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-27 06:55:32 +00:00
Ingo Schommer
1193aed711 BUGFIX Fixed SiteTree::can_edit_multiple() and canEdit() to collect permissions from different Versioned tables, which fixes querying a SiteTree record which has been deleted from stage for its permissions (e.g. in SiteTreeActionsTest)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85336 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-27 06:53:28 +00:00
Tom Rix
e7e0e9424d MINOR added better handling of pages that result in no URLSegment
MINOR added QuarterHourly scheduled tasks, tidied documentation a little bit

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-17 22:30:27 +00:00
Tom Rix
a79452e23a 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/sapphire/trunk@84231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-12 21:19:04 +00:00
Sam Minnee
bdccbdfbcf MINOR: Fixed notice-level error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84148 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-11 04:46:47 +00:00
Tom Rix
63e2d4d72e ENHANCEMENT added new permission, SITETREE_REORGANISE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84073 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-09 22:29:45 +00:00
Sam Minnee
3c47db80d8 BUGFIX: Fixed other parts of core in response to the changing of MySQLDatabase to not inherit from object.
BUGFIX: Restored SiteTree::canView() functionality.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84068 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-08 04:23:05 +00:00
Tom Rix
5a7c217ea6 BUGFIX prevent a nasty permissions situation where no one but an admin can edit a new page
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-06 23:31:16 +00:00
Tom Rix
7a35596c28 BUGFIX prevent a nasty permissions situation where no one but an admin can edit a new page
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@83999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-06 23:30:17 +00:00
Sam Minnee
3c5f477b6e BUGFIX: Dealt with some undefined vairable bugs in SiteTree::can_edit_multiple
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@83494 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-03 03:13:17 +00:00
Will Rossiter
49e7ca8e7c MINOR: added empty array to prevent notice level error about can_delete_multiple when accessing the cms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@83451 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-01 23:54:36 +00:00
Sam Minnee
43ad2ad6b5 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/sapphire/trunk@83442 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-31 05:43:41 +00:00
Sam Minnee
6a52153b9f BUGFIX #4285: Fixed application of decorators when add_extension not used.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-13 03:56:26 +00:00
Sam Minnee
c280542b9b BUGFIX Only trigger BackLinkTracking updates in SiteTree->onBeforeWrite() if the URLSegment is an actual change (type 2), not only a type change. This messed up batch publications, are previously published pages were marked as changed in subsequent write calls to the same object. (from r78337)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 05:55:17 +00:00
Saophalkun Ponlu
121a92a86a FEATURE: Single instance only page (in the site tree). OS ticket #1554
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-23 17:45:55 +00:00
Sam Minnee
e0fbc7ac83 BUGFIX: Added explicit DataObjectDecorator::load_extra_statics() calls as a workaround for issues with extensions defined directly in-object.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79720 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-22 02:42:42 +00:00
Sean Harvey
6c754d29e9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 11:36:49 +00:00
Sam Minnee
fb470bc53d ENHANCEMENT: Added SITETREE_VIEW_ALL and SITETREE_EDIT_ALL permission code, which provide better performance for editors that can edit everything but who aren't ADMINs.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78630 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-08 07:00:37 +00:00
Ingo Schommer
c1d59185a9 BUGFIX Using new DBField->isChanged() in VirtualPage and SiteTree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77914 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-27 02:09:18 +00:00
Sam Minnee
6eb61e0844 BUGFIX: Don't break CMS tree if HTML gets into MenuTitle
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77826 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 03:45:12 +00:00
Sean Harvey
75ba6a1ab9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 06:59:21 +00:00
Will Rossiter
1640844189 MINOR: changed MetaDescription to text field as the optiomal SEO guides Description to be up to 744 characters. MINOR: changed MetaKeywords textbox to 2 rows high to provide a visual cue for amount of keywords to use.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-22 00:53:53 +00:00
Sean Harvey
6369bb80de API CHANGE Removed @deprecated 2.3 GhostPage and SiteTree::MultipleParents() which used it
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77383 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 06:45:32 +00:00
Sean Harvey
834c143e61 MINOR #3888 Added name to HomepageForDomain literal field in SiteTree so it can be manipulated later on (bgribaudo)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77272 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-19 23:16:20 +00:00
Ingo Schommer
2dd58c8a66 BUGFIX Added base javascript requirements to SiteTree->getCMSFields() to avoid it failing when used outside of CMS context (e.g. in our frameworktest project)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 20:55:10 +00:00
Sean Harvey
161e7a35c7 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77020 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 23:15:31 +00:00
Sean Harvey
4ded1f4930 Merged r77016 from sapphire/branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77017 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 22:59:48 +00:00
Ingo Schommer
67180937ff API CHANGE Deprecated Translatable::current_lang(), use Translatable::get_current_locale()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:05:48 +00:00
Sean Harvey
b1018f5864 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 05:26:47 +00:00
Sean Harvey
2b042be1ff MINOR Fixed merging error in SiteTree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76662 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 05:13:32 +00:00
Sean Harvey
0a5f4de51c Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 05:12:47 +00:00
Sam Minnee
f296534380 BUGFIX: Fixed SiteTree::doRestoreToStage() for db abstraction.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76369 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-07 05:59:24 +00:00
Sam Minnee
e4efbcb78c BUGFIX: Removed 2nd and 3rd full-text indexes from SiteTree, because these confuse MSSQL, and are kind of a MySQL-specific hack anyway.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76344 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-07 03:48:47 +00:00
Sean Harvey
f4eecd4d0d Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75903 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-04 01:20:12 +00:00
Sean Harvey
9b75cb1987 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-01 03:49:34 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 00:07:39 +00:00
Sean Harvey
76b5adc979 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-28 23:52:15 +00:00
Geoff Munn
eb86cc1b07 Re-enabled searchable fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75297 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-27 21:38:46 +00:00
Geoff Munn
f326047536 basic templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75295 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-27 21:37:35 +00:00
Geoff Munn
66ca0daa61 BUG FIX: Fulltext search fields restored
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@74085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-05 23:37:17 +00:00
Geoff Munn
03acac8e59 API CHANGE: addslashes now DB-specific
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@74083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-05 23:24:56 +00:00
Ingo Schommer
740dfef39e API CHANGE Removed SiteTree->LegacyURL property - it was never evaluated as a fallback in controllers anyway, and is just confusing to have without any functionality or edit interface attached to it (originally committed in r22189)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@74066 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-03 17:41:10 +00:00
Ingo Schommer
e482ada014 API CHANGE Deprecated Translatable::enable() and i18n::enable()- use Object::add_extension('SiteTree','Translatable'), Deprecated Translatable::disable() and i18n::disable() - use Object::remove_extension('SiteTree','Translatable'), Deprecated Translatable::enabled() - use $myPage->hasExtension('Translatable')
API CHANGE Removed Translatable::creating_from() - doesn't apply any longer
ENHANCEMENT Translatable extension is no longer hooked up to SiteTree by default, which should improve performance and memory usage for sites not using Translatable. Please use Object::add_extension('SiteTree','Translatable') in your _config.php instead. Adjusted several classes (Image, ErrorPage, RootURLController) to the new behaviour.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73951 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-01 16:35:32 +00:00
Ingo Schommer
9886aef57d BUGFIX Removed version number from <meta> generator tag - opt for security by obscurity in this case (originally committed in r70422 and r71172)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73836 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-30 16:34:38 +00:00
Geoff Munn
6a53df681f BUG FIX: Fulltext fields restored in SiteTree.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-25 22:56:43 +00:00
Geoff Munn
50ca8ff01a MSSQL enabled for GW metlink
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73647 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-25 21:06:06 +00:00
Ingo Schommer
7ad7f8dcf2 ENHANCEMENT Adjusted SearchForm, Debug, ErrorPage, SiteTree to using locales instead of lang codes
API CHANGE Changed Translatable datamodel to use locales ("en_US") instead of lang values ("en).
API CHANGE Changed Translatable::$default_lang to $default_locale, Translatable::$reading_lang to $reading_locale
API CHANGE Using "locale" instead of "lang" in Translatable::choose_site_lang() to auto-detect language from cookies or GET parameters
API CHANGE Deprecated Translatable::is_default_lang(), set_default_lang(), get_default_lang(), current_lang(), set_reading_lang(), get_reading_lang(), get_by_lang(), get_one_by_lang()
API CHANGE Removed Translatable::get_original() - with the new "translation groups" concept there no longer is an original for a translation
BUGFIX Updated MigrateTranslatableTask to new Locale based datamodel

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-20 08:47:06 +00:00
Ingo Schommer
fef49abefa BUGFIX Disabled "untranslated" CSS class for SiteTree elements - doesn't apply any longer with the new "translation groups" concept
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73339 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 16:15:46 +00:00
Geoff Munn
ef5c9a42d5 BUG FIX: SQL queries fixed for MSSQL
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72983 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-12 21:48:58 +00:00
Sam Minnee
08a5a7c387 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-10 22:08:52 +00:00
Ingo Schommer
7f4f57c307 ENHANCEMENT Added i18n::get_lang_from_locale() and i18n::convert_rfc1766()
ENHANCEMENT Using IETF/HTTP compatible "long" language code in SiteTree->MetaTags(). This means the default <meta type="content-language..."> value will be "en-US" instead of "en". The locale can be either set through the Translatable content language, or through i18n::set_locale()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-02 22:13:30 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-01 23:49:53 +00:00
Ingo Schommer
2956cc482f FEATURE Supporting search for special characters like umlauts in SearchForm. These characters are encoded to HTML entities by TinyMCE for SiteTree->Content, hence we need a special case in the search logic (incl. unit tests)
ENHANCEMENT Added MySQL FULLTEXT index for $Content property on SiteTree, Needs separate indexing to be searchable by SearchForm - $Content is the only field which has special characters encoded as HTML entities (through TinyMCE)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@70328 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-19 02:49:42 +00:00
Ingo Schommer
7ccd1bbc24 ENHANCEMENT Looking for URLSegments in languages outside of default language in ModelAsController by implementing a new extension point in SiteTree::get_by_url(): DataObjectDecorator->alternativeMatches()
ENHANCEMENT Allowing non-default language URLs to be accessed without explicitly specifying the language in GET request

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@70305 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-16 04:07:17 +00:00
Andrew O'Neil
2b6842e634 BUGFIX: Fixed URLs having to unique across languages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@70078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-13 05:02:11 +00:00
Ingo Schommer
d3d6ae833d 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


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69959 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 12:15:30 +00:00
Ingo Schommer
b7d394008e MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:35:50 +00:00
Ingo Schommer
c8200f67ac BUGFIX Fixed SiteTree->getIsDeletedFromStage() to return false on non-numeric IDs (isNew())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69857 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-07 23:01:38 +00:00
Ingo Schommer
c4250635bc BUGFIX Disabling batch selection of pages without publication rights in SiteTree->CMSTreeClasses()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-06 02:46:16 +00:00