Commit Graph

69 Commits

Author SHA1 Message Date
Sean Harvey
0968eac399 BUG Fixing misspelled variable not being able to select subsite for Folder 2013-02-04 15:21:08 +13: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
601e8d6c68 Fixed fixture class references 2013-01-03 14:15:41 +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
Sean Harvey
488ea71c45 Removing unncessary end PHP tags from subsites code 2012-10-12 11:08:24 +13:00
Sean Harvey
d4df26db72 BUG Fixing correct URL location to pages 2012-10-10 13:49:08 +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
Ingo Schommer
869e90d129 MINOR Fixed SiteTreeSubsitesTest->testPageTypesBlacklistInClassDropdown() to work with PHP 5.2, and not rely on the Reflection API (broken in 17dde8ff) 2011-11-15 14:15:28 +01: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
Sam Minnee
9ad409d5d4 BUGFIX: Removed virtual pages tab from subsites. (sminnee, merged from r100426) 2011-09-22 18:19:22 +02: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
Ingo Schommer
17dde8ff58 FEATURE Blacklisting of page types by subsite through Subsite->PageTypeBlacklist (AIR-20) 2011-08-30 18:59:21 +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
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
Ingo Schommer
85a095702b MINOR Removed dependency on sapphire fixture file 2011-03-29 21:58:45 +13:00
Sean Harvey
abed456e16 MINOR Removed unncessary test as permission checks are done in separate test cases in SiteTreeSubsitesTest 2010-08-23 00:19:07 +00: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
Julian Seidenberg
a7935bc3e3 BUGFIX: admin user can now access subsite zero (main site) without the LeftAndMain access check reverting them back to a previous subsite (includes test for this edge-case). 2010-07-26 03:56:03 +00:00
Ingo Schommer
55214b3e24 MINOR Adapted SubsitesVirtualPageTest to changed File API (see r107268) 2010-06-29 06:10:16 +00:00
Geoff Munn
cdc419a2f2 BUGFIX: hardcoded ID replaced with actual value 2010-05-06 03:27:44 +00: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
92976e8eff MINOR get the files & error page tests on subsites passing 2010-03-30 20:43:34 +00:00
Tom Rix
1b4c314304 2010-03-21 22:32:22 +00:00
Sean Harvey
a9ce309881 MINOR Fixed broken test 2010-03-16 23:22:42 +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
fa21df693f MINOR pass tests 2010-03-02 01:15:11 +00:00
Tom Rix
3dd9b2a1e4 BUGFIX syntax errors 2010-03-01 22:43:04 +00:00
Tom Rix
ac65b11483 MINOR fixed language (from r94920) (from r96343) 2010-03-01 22:33:28 +00:00
Tom Rix
30f9d15694 MINOR when a parent page is unpublished, unpublish all related virtual pages, includes test coverage (from r94777) (from r96340) 2010-03-01 22:32:42 +00:00
Tom Rix
12c9705f47 BUGFIX: Fix virtual page logic for subsite virtual pages too. (from r93916) (from r96338) 2010-03-01 22:32:24 +00:00
Tom Rix
d3e666c09a MINOR: Added test for link rewriting on SubsitesVirtualPages (from r89909) (from r96322) 2010-03-01 22:27:46 +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
99a788a0dc MINOR: Removed debug statement from test (from r96641) (from r96650) 2010-03-01 21:42:25 +00:00
Tom Rix
bd649d170d MINOR fixed language (from r94920) 2010-03-01 21:42:05 +00:00
Tom Rix
bdf07e05c0 MINOR when a parent page is unpublished, unpublish all related virtual pages, includes test coverage (from r94777) 2010-03-01 21:41:24 +00:00
Tom Rix
4d90cfeeb3 BUGFIX: Fix virtual page logic for subsite virtual pages too. (from r93916) 2010-03-01 21:41:06 +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
f7abf23ac7 MINOR: Added test for link rewriting on SubsitesVirtualPages (from r89909) 2010-03-01 21:38:59 +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