tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity
906 Commits 30 Branches 84 Tags 5.2 MiB
2f7dc7a7a8
Commit Graph

159 Commits

Author SHA1 Message Date
Werner M. Krauß
b8f98323ae merge #2 2017-05-30 11:14:51 +02:00
Werner M. Krauß
9862cf5ea6 merge ss4 fixes by cheddam 2017-05-29 13:42:42 +02:00
Werner M. Krauß
d1e829697f adjusting test fixtures yml file 2017-05-24 15:40:58 +02:00
Werner M. Krauß
c5f507b3f9 reformat code and tests 2017-05-24 15:26:28 +02:00
Werner M. Krauß
2295501587 upgrade tests 2017-05-24 15:25:34 +02:00
Werner M. Krauß
ef602abe47 replace config::inst()->update() with config::modify->set() 2017-05-24 15:20:51 +02:00
Loz Calver
e8f5f58bb0 SS4 namespaces compatibility 2016-09-23 09:34:23 +01:00
Damian Mooyman
0e61dfc3f6 BUG Prevent translatable / subdirs interfering with test state 2016-08-23 12:36:12 +12:00
Will Rossiter
c8f6f4a588 NEW: Add IncludeChildren option for copying pages between subsites. 2016-07-18 16:41:38 +12:00
Ingo Schommer
871e2bcefd Merge pull request #250 from open-sausages/pulls/fix-copy 
BUG Fix copy to subsite breaking on sub-pages
 2016-06-13 10:24:13 +12:00
Damian Mooyman
ff28ac1b1e BUG Fix copy to subsite breaking on sub-pages 
Fixes #192

Signed-off-by: Damian Mooyman <damian@silverstripe.com>
Signed-off-by: Ingo Schommer <ingo@silverstripe.com>
 2016-06-13 10:23:33 +12:00
Damian Mooyman
98636f8f58
BUG Prevent SubsiteXHRController failing if there are no subsites available 
Fixes #200
 2016-05-27 15:55:27 +12:00
Damian Mooyman
a98958fdf9
BUG Fix issue with urlsegment being renamed in subsites 2016-05-23 15:29:01 +12:00
Damian Mooyman
ce90c2124b API Add option to specify http / https on subsite domains 2015-11-24 18:03:49 +13:00
Damian Mooyman
a0ede56c0e Reformat for psr-2 2015-11-23 16:53:45 +13:00
Damian Mooyman
0d7dc49d6b API Rename mysiteconfig to subsiteconfig 
API make ErrorPageSubsite 4.x compatible
BUG Fix incorrect yml
BUG Fix incorrect DataExtension::augmentSQL implementation
 2015-11-20 17:04:23 +13:00
Damian Mooyman
bfc70f9b06 Fix subsites to use correct permissions 
See http://www.silverstripe.org/software/download/security-releases/ss-2015-008-sitetree-creation-permission-vulnerability

Conflicts:
	tests/SiteTreeSubsitesTest.php
 2015-04-30 22:34:28 +12:00
Ingo Schommer
c18a0a266f Adjusted tests to new SiteTree->canCreate() logic in 3.1.11+ 
Checks SiteConfig permissions by default now
 2015-04-30 22:34:28 +12:00
Damian Mooyman
5b9af35566 Use 3.2 compatible API 2015-02-24 09:34:34 +13:00
Damian Mooyman
a97b0d33eb BUG Fix incompatibility with framework 3.2 2014-08-26 11:42:50 +12:00
Mateusz Uzdowski
9cf7a1453f BUG Fixes to link rewriting when previewing subsites. 
* JS error with href-less links.
* All forms get injected hidden fields, even though the loop attempts to
check for only the ones that submit locally.
* Also check for action-less forms.

Requires
https://github.com/silverstripe/silverstripe-framework/pull/3000 to be
merged for the Framework.
https://github.com/silverstripe-labs/silverstripe-testsession/pull/11
 2014-04-02 13:39:01 +13:00
Mateusz Uzdowski
58b926af25 BUG Refactor the access checks and initial subsite redirections. 
Remove the special AJAX handling to simplify the code. Now redirection
will be forced on any request that changes the subsite to re-synchronise
with the frontend.

Introduce canAccess method, and add it to alternateAccessCheck to make
sure this subsite-specific chceck is also done in situations that are
not captured by onBeforeInit.
 2013-12-04 17:34:27 +13:00
Mateusz Uzdowski
aacaee08cd BUG Prevent session-interface mismatch. 
Disables transparent subsite switch on AJAX requests.

Makes sure the subsite is appropriately set up when opening up the CMS
with a link to subsited object.
 2013-11-08 11:37:10 +13:00
Ingo Schommer
5ff3b691d7 More globalisation 2013-10-30 13:44:06 +01:00
Ingo Schommer
c0e6d1ad38 Added unit test around "forbidden section" redirection 
See https://github.com/silverstripe/silverstripe-subsites/pull/115
 2013-10-23 01:50:55 +02:00
Mateusz Uzdowski
d85412adf7 Fix the test coverage for the subsite access changes. 2013-10-18 11:58:11 +13:00
spronkey
586d88562c Added test case for subsites virtual page onAfterWrite issue, plus changed get_from_all_subsites method to immediately eval and return an ArrayList, instead of lazy eval DataList. Fixes #106 2013-09-12 14:23:42 +12:00
Ingo Schommer
b49c86bd0b Require subsite title (fixes #26) 2013-07-10 16:28:08 +02:00
Ingo Schommer
0e9c3344ac Removed disabled tests (#29) 
They use all kinds of outdated APIs (in test system and CMS controllers),
and the function rename makes it unclear that they're actually disabled.
These kinds of tests should be performed through Behat anyway.
 2013-07-10 15:55:16 +02:00
Frank Mullenger
7bf6e89320 BUGFIX: Session var for active subsite out of sync with current subsite. Refs silverstripe/silverstripe-subsites#93. 2013-07-10 12:24:42 +02:00
Sean Harvey
f0de6f2d87 fixing test to check for all extended cache keys, not just the immediate 2013-05-07 15:11:11 +12:00
Sean Harvey
f39ee67c4a Fixing test for postgres, make sure the array is indexed from 0 2013-05-06 23:25:20 +12:00
Sean Harvey
6e4f22deab Fixing incorrect order of items in array for test 2013-05-06 23:12:59 +12:00
Sean Harvey
cf1a1cb6dd Fixing test for PostgreSQL 2013-05-06 23:07:16 +12:00
Sean Harvey
ffaaed072f Removing bits of test that broke because of removal of related pages 2013-05-01 17:01:56 +12:00
Sean Harvey
0247765563 API Removed related pages functionality, this is now a separate module 
If you need this functionality still, please checkout
github.com/silverstripe-labs/silverstripe-subsites_relatedpages
 2013-05-01 12:35:17 +12:00
Sean Harvey
6f9a1bf6fb Testing initial state of disable_subsite_filter 2013-04-30 15:50:45 +12:00
Sean Harvey
411abed7b8 Removing tests related to MetaTitle, this field doesn't exist anymore 2013-04-30 15:42:36 +12:00
Sean Harvey
3848f90a5a Removed use of deprecated Object::get_static() 2013-04-30 15:34:26 +12:00
Sean Harvey
c9d5627e9f Updating test to use Config instead of static setting 2013-04-30 15:25:21 +12:00
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
Tom Rix
3171075cd5 MINOR unit tests (from r83592) 2010-03-01 02:58:13 +00:00
Tom Rix
53d51e40ba 2010-03-01 02:56:19 +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
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
Sam Minnee
6037ec56e5 BUGFIX: Fixed subsite query rewriting with trunk query syntax 2009-03-09 09:24:35 +00:00