Commit Graph

30 Commits

Author SHA1 Message Date
Sean Harvey
ffaaed072f Removing bits of test that broke because of removal of related pages 2013-05-01 17:01:56 +12:00
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
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
Mateusz Uzdowski
5f337db553 BUGFIX: make sure non-admins can access the main site via group role 2011-10-05 17:58:24 +13:00
Ingo Schommer
2b506b02b1 ENHANCEMENT Allowing strict subdomain checks on 'www.example.com' vs. 'example.com' via Subsite::$strict_domain_matching (AIR-54) 2011-09-09 12:40:05 +02:00
Ingo Schommer
32d51ed986 MINOR Clearer testing and documentation around wildcard usage for domain matching 2011-09-09 10:50:52 +02:00
Ingo Schommer
fbe9eec50b MINOR Code formatting 2011-09-09 10:33:43 +02:00
Ingo Schommer
1697126957 MINOR Testing and documenting "super-admin" behaviour on "ADMIN" permission in Subsite::accessible_sites() and Subsite::hasMainSitePermission() 2011-09-05 17:54:57 +02:00
Geoff Munn
06bb7c7423 BUGFIX: tables and columns quoted properly 2010-04-29 22:58:10 +00:00
Tom Rix
b83b2b442a MINOR line coverage to 70% 2010-03-30 22:50:37 +00:00
Tom Rix
1b4c314304 2010-03-21 22:32:22 +00:00
Sean Harvey
7e84789509 BUGFIX Fixed calls to SiteTree::get_by_url() which is deprecated, replacing with SiteTree::get_by_link() 2010-03-09 03:08:43 +00:00
Sean Harvey
a43459515b BUGFIX Removed backticks from SubsiteTest 2010-03-09 01:10:39 +00:00
Tom Rix
29dda5abdf BUGFIX: Ensure that DataObject::get_one() cache knows which subsite you're on (from r93096) 2010-03-01 21:41:01 +00:00
Tom Rix
60cc9f9650 ENHANCEMENT: Groups can now be associated to multiple subsites. (from r89791) 2010-03-01 21:37:56 +00:00
Tom Rix
3bde3f1f60 MINOR Fixed assertions in SubsiteTest (from r85449) 2010-03-01 03:00:40 +00:00
Tom Rix
3171075cd5 MINOR unit tests (from r83592) 2010-03-01 02:58:13 +00:00
Tom Rix
9a556a31f9 2010-03-01 02:48:45 +00:00
Geoff Munn
1b7408dfb1 API CHANGE: column names quoted properly 2009-11-02 01:59:15 +00:00
Ingo Schommer
9b1fae7901 ENHANCEMENT Added URLSegment test to SubsiteTest 2009-10-16 01:15:54 +00:00
Sam Minnee
ae27dc25ff MINOR: Fixed tests 2009-05-13 22:44:55 +00:00
Sam Minnee
b646a104f1 Merged from branches/0.1 2009-05-04 05:03:44 +00:00
Ingo Schommer
6d25adedc0 ENHANCMENENT Added SiteTreeSubsites->can*() methods for true permission control on model-layer rather than generic controller checks (incl. unit tests)
MINOR documentation
2008-11-24 06:37:22 +00:00
Sam Minnee
3275d689b9 Made subsite query augmentation more robust - can handle a lack of a where clause
Made SubsiteTest clean up after itself
2008-08-13 04:33:01 +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
5e9b67216f Initial alpha version of the subsites module 2007-08-16 06:38:29 +00:00