Commit Graph

34 Commits

Author SHA1 Message Date
Damian Mooyman
c22c8dc810 Merge remote-tracking branch 'origin/1.0' into 1.1
Conflicts:
	code/extensions/LeftAndMainSubsites.php
	tests/SiteTreeSubsitesTest.php
2015-11-13 19:02:12 +13:00
Ingo Schommer
cf534aad31 BUG Subsites selection on SubsitesVirtualPage (fixes #45 and #47) 2015-11-13 17:31:44 +13:00
wernerkrauss
996abfcc58 Wrong edit link in SubsitesVirtualPage
In SS3.1 we have /admin/pages for cms, was still old link.
2015-06-17 16:30:56 +02:00
Ingo Schommer
5ff3b691d7 More globalisation 2013-10-30 13:44:06 +01:00
Sean Harvey
306cb79b19 Fixing more statics that weren't private, and nested_urls deprecated usage 2013-05-06 22:32:40 +12:00
Sean Harvey
8ffeeb1ee6 Fixing declaration of statics to private for 3.1+ compatibility 2013-05-06 22:21:09 +12:00
Robert Curry
5effc64607 Add description to Subsites Virtual Page 2013-04-29 12:25:29 +12:00
Sean Harvey
488ea71c45 Removing unncessary end PHP tags from subsites code 2012-10-12 11:08:24 +13:00
UndefinedOffset
ef4d539a12 BUG: Merged patch from kmayo how ever re-added some of the removed fields since they really should appear on the Main Content tab instead of the Metadata tab.
Fixed a few missed strict errors

Applied patch from kmayo to fix issues with SubsiteAdminTest.php

Fixed issue causing the url segments of subsites created from a template to add -2 to the end

Fixed undefined method TotalItems() on datalist for the SubsiteTest

Fixed failure on SubsiteTest because DataObject::get_one() now returns boolean false instead of null when no result is found

Fixed failure on SubsitesVirtualPageTest caused by Versioned::get_one_by_stage() returning null instead of false

Fixed failure caused by the contact-us page existing on subsite 2

Merged another patch from kmayo

Force main site to be on, for some reason it gets hidden in some cases i.e. refreshing the cms while editing a page
2012-07-16 11:21:54 +12:00
UndefinedOffset
598b0253f5 BUG: Coding convention updates 2012-07-16 11:21:30 +12:00
Ed
2ef72b374c BUG: Modifying the module to work with SS 3.0
Replaced deprecated DataObjectDecorator with DataExtension

Fixed hard crashes in the cms

Updated to support new LeftAndMain template structure

Made the subsites model admin functional

Moved the LeftAndMain_Menu template up a directory so it overrides the core

Fixed some errors caused by changes to the framework

Re-organized the code folder

Fixed permission issue causing to default to first subsite regardless if it is the default or not

Fixed crashes on the subsite virtual page when creating/editing

Removed toDropdownMap() calls replacing with map()

Fixed the URLSegment field on subsites

Fixed error when detecting subsite for a domain

Improved styles on the subsite dropdown

Updated LeftAndMain_Subsites.js to work with jQuery entwine

Started porting the SubsitesTreeDropdownField.js to use jQuery entwine and work with the new TreeDropdownField.js

Fixed issue causing crash when viewing a page who is linked to by a subsite virtual page

Removed unused methods on SubsitesTreeDropdownField.js

Re-added classes that were moved

Fixed hard crash after saving caused by the many_many definition on SiteTreeSubsites

Replaced deprecated DataObjectSet creation with ArrayList

Compatibility fixes with SS 3.0 beta 2

Fixed crash in cms caused by no parameter being passed to the SubsiteReportWrapper constructor

Proper fix for report wrapper

Removed table list field in favor of a basic grid field

Fixed updateCMSFields() for file subsites

Migrated translations to yml

Fixed issue causing the current page to not get cleared when changing subsites in the cms

Fixed virtual page icon

Fixed language files issue
2012-07-16 11:18:38 +12:00
Sam Minnee
28f63853e1 BUGFIX: Show virtual pages in virtual page tree select field (so that you can select their children), but ignore any attempts to set the tree select field to a virtual page when saving. (by sminnee, merged from r100638) 2011-09-22 18:19:40 +02:00
Ingo Schommer
552a6e784d BUGFIX Consistently resetting Subsite::$disable_subsite_filter to its original state 2011-09-12 12:18:56 +02:00
Ingo Schommer
47c545f658 API CHANGE Removed unused nextWriteDoesntCustomise flag on SiteTreeSubsites, removed references to non-existent CustomContent field in SiteTreeSubsites->onBeforeWrite() (field was removed with 08207510c in 2008) (AIR-52) 2011-09-07 21:55:13 +02:00
Ingo Schommer
72e1e5b1b2 BUGFIX Overload validateURLSegment() in SubsitesVirtualPage to allow for same URLSegments as linked pages, as long as they only exist in a different subsite (only change the URLSegment if it already exists in the same subsite). (AIR-4) 2011-08-22 17:52:21 +02:00
Ingo Schommer
59c3dd1ea2 BUGFIX Fixes wrong logic for session existence checks in ErrorPageSubsite and SubsitesVirtualPage (no current controller is available when called through "phpunit" executable) 2010-09-22 01:43:57 +00:00
Tom Rix
f5bbbf979e BUGFIX: Don't let SubsitesVirtualPages link to subclasses of virtual page (from r100004) 2010-03-01 22:35:35 +00:00
Tom Rix
a85521fcb1 ENHANCMENT improved reporting around broken links/files (from r88993) (from r96305) 2010-03-01 22:13:35 +00:00
Tom Rix
93afe6e6ff MINOR Custom meta tags on SubsiteVirtualPages no longer get overwritten. (from r87329) 2010-03-01 21:49:50 +00:00
Tom Rix
3bdaa1404c MINOR fix failing tests (from r90509) 2010-03-01 21:40:36 +00:00
Tom Rix
0ba7ee6b17 BUGFIX: Improved reliability of SubsiteTreeDropdownField (by getvar length shorter) (from r89840) 2010-03-01 21:38:32 +00:00
Tom Rix
caddec36bc BUGFIX fix reverting to parent content (from r89097) 2010-03-01 21:33:46 +00:00
Tom Rix
4f268110b1 ENHANCMENT improved reporting around broken links/files (from r88993) 2010-03-01 21:33:12 +00:00
Tom Rix
0ab9ffef9e MINOR: Don't throw an error if no subsites are defined. (from r88951) 2010-03-01 21:26:53 +00:00
Tom Rix
d4dbeb17f5 MINOR always show the subsite dropdown, (from r88892) 2010-03-01 21:26:35 +00:00
Tom Rix
ea21e6ff35 MINOR if you clear a custom metadata field, it will reset back to the parent. (from r88838) 2010-03-01 21:26:20 +00:00
Tom Rix
22b407168c BUGFIX fixed crash scenario in LeftAndMainSubsites
MINOR changed wording on Subsite Virtual Pages. (from r88101)
2010-03-01 21:26:13 +00:00
Tom Rix
b696fb8e03 FEATURE: Allow overriding of metadata of subsites virtual pages (from r85204) 2010-03-01 03:00:29 +00:00
Tom Rix
c81319e23b Merged r84433 (from r84787) 2010-03-01 02:58:31 +00:00
Tom Rix
40ff605fbf BUGFIX allow Subsite Virtual Pages to share a URL Segment (from r82346) 2010-03-01 02:56:01 +00:00
Saophalkun Ponlu
5406ab5b60 BUGFIX: Fixed SubsitesVirtualPage operation for the main site, and fixed selection of currently selected value. 2009-07-30 02:11:02 +00:00
Sam Minnee
1dcd84e098 MINOR: Fixed test execution for SubsitesVirtualPage 2009-05-04 05:04:08 +00:00
Ingo Schommer
3315786c66 BUGFIX Fixed field addition bug in SubsitesVirtualPage 2008-12-03 22:33:01 +00:00
Ingo Schommer
e17ecfbdee FEATURE Support for VirtualPage-style linkage between subsites with new SubsiteVirtualPage class
ENHANCEMENT Allowing to select a subsite explicitly through admin-URLs, e.g. /admin/show/22/?SubsiteID=2
2008-12-02 03:50:06 +00:00