Commit Graph

22 Commits

Author SHA1 Message Date
Ingo Schommer
82f1d980e8 Merge remote-tracking branch 'origin/0.3'
Conflicts:
	code/SubsiteAdmin.php
	code/extensions/LeftAndMainSubsites.php
	code/extensions/SiteTreeSubsites.php
	code/model/Subsite.php
	composer.json
	javascript/SubsitesTreeDropdownField.js
	lang/en_US.php
	tests/SubsiteAdminTest.php
	tests/SubsiteTest.php
	tests/SubsiteTest.yml
	tests/SubsitesVirtualPageTest.php
2013-01-03 21:03:26 +01:00
Ingo Schommer
dfeb52de87 Fix test failures caused by subsite filtering on fixture retrieval 2013-01-03 14:51:04 +01:00
Ingo Schommer
f909aad7b4 API CHANGE Removed Subsite_Template subclass, as it unnecessarily duplicates the Subsite->duplicate() logic in Subsite_Template->createInstance(). It also arbitrarily limits duplication of subsites to templates. 2013-01-03 14:10:08 +01:00
Sean Harvey
d4faeac98f Merge branch 'master' of git://github.com/halkyon/silverstripe-subsites into halkyon-master 2012-10-12 15:09:38 +13:00
Sean Harvey
89c6382101 Remove adminSearchFields which is never used and causes a test failure 2012-10-12 12:54:18 +13:00
Kirk Mayo
c345f6fcc5 BUG: Coding convention fixes
BUG: more coding convention fixing
2012-07-16 11:44:54 +12: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
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
Mateusz Uzdowski
fb998aec87 BUGFIX: Change the default setting to include the main site. Users able to AccessAllSites should be able to access
the main site as well.
2011-04-11 12:59:42 +12:00
Julian Seidenberg
d77e9c9415 BUGFIX: fixed broken test in subsites module that relies on specific numeric IDs 2010-08-03 22:41:10 +00:00
Tom Rix
b83b2b442a MINOR line coverage to 70% 2010-03-30 22:50:37 +00:00
Tom Rix
3171075cd5 MINOR unit tests (from r83592) 2010-03-01 02:58:13 +00:00
Tom Rix
c575a0c09c BUGFIX: Updated subsites tests for ModelAdmin version of SubsiteAdmin (from r81428) 2010-03-01 02:53:22 +00:00
Tom Rix
9a556a31f9 2010-03-01 02:48:45 +00:00
Andreas Piening
e11ca71be6 MINOR: Fixed subsite test that was assuming that subsite ID#s would start at 1 (false in some cases) 2010-01-14 06:29:12 +00:00
Sam Minnee
b646a104f1 Merged from branches/0.1 2009-05-04 05:03:44 +00:00
Sam Minnee
4ba1ce143a BUGFIX: Fixed bug where you couldn't edit templates that had no subdomain.
ENHANCEMENT: Mark global groups in the subsite list, rather than subsite groups.
ENHANCEMENT: When creating a subsite from a template, copy the groups as well as the pages, but leave the groups empty.
2009-02-24 22:09:15 +00:00
Sam Minnee
63212411a0 Disabled a broken test pending further review 2008-03-19 04:26:00 +00:00
Sam Minnee
5aff60efb5 More testing and debugging 2007-08-21 01:38:20 +00:00
Sam Minnee
dd4045b2bb Added tests and fixed associated bugs in the subsite admin section 2007-08-20 22:37:43 +00:00
Sam Minnee
55eed874f3 Added tests for SubsiteAdmin search 2007-08-17 05:50:23 +00:00
Sam Minnee
5e9b67216f Initial alpha version of the subsites module 2007-08-16 06:38:29 +00:00