Commit Graph

447 Commits

Author SHA1 Message Date
Sean Harvey
397f74a561 Removing underscore from text 2013-04-30 15:08:47 +12:00
Sean Harvey
8a280b1865 BUG Fixing deprecated setEmptyString() 2013-04-30 15:08:13 +12:00
Sean Harvey
5a75b31226 Merge pull request #78 from robert-h-curry/page-description
Add description to Subsites Virtual Page
2013-04-28 17:34:29 -07:00
Robert Curry
5effc64607 Add description to Subsites Virtual Page 2013-04-29 12:25:29 +12:00
Sean Harvey
c185843e94 Merge pull request #75 from mlewis-everley/patch-1
Make LeftAndMain redirect direct to admin
2013-04-25 19:10:16 -07:00
Sean Harvey
734d08e2b5 Merge pull request #77 from robert-h-curry/gitignore
Add gitignore
2013-04-25 19:09:38 -07:00
Sean Harvey
8a1775a8db Merge pull request #76 from robert-h-curry/3.1-docs
Add markdown version of docs, upgrade docs to 3.1
2013-04-25 19:09:25 -07:00
Robert Curry
7ae5e40e64 Add gitignore 2013-04-26 14:04:53 +12:00
Robert Curry
21d2d69824 Add markdown version of docs, upgrade to 3.1 2013-04-26 14:03:57 +12:00
Morven Lewis-Everley
5747704c97 Make LeftAndMain redirect direct to admin
Currently, using the Subsites dropdown in the admin interface causes the CMS to reload to admin/pages. This can cause issues if you have set another interface as your default (other than CMSMain).
2013-04-25 19:29:56 +02:00
Sean Harvey
6dcc30071a Updating README and composer.json for 3.1 requirements 2013-04-04 15:17:09 +13:00
Sean Harvey
355bb8ca8f Merge pull request #72 from robert-h-curry/3.1-compatibility
Extension and config fixes for 3.1
2013-04-03 19:14:27 -07:00
Robert Curry
90c16117f3 Extension and config fixes for 3.1 2013-04-04 15:10:22 +13:00
Sean Harvey
01176ec6ed Merge pull request #73 from robert-h-curry/new-sitetree-hack
Remove unnecessary hack. Fixes #69 and #71.
2013-04-03 13:06:06 -07:00
Ingo Schommer
d57ce9f1a8 Travis support 2013-03-29 09:50:12 +01:00
Robert Curry
af7db1b452 Remove unnecessary hack. Fixes #69 and #71. 2013-03-27 15:27:09 +13:00
Sean Harvey
3c447a3218 Updating LeftAndMain_Menu template override with latest changes 2013-02-05 12:29:46 +13:00
Sean Harvey
0968eac399 BUG Fixing misspelled variable not being able to select subsite for Folder 2013-02-04 15:21:08 +13:00
Sean Harvey
bf1390f0f8 BUG Fixing saving of Subsite records from SubsiteAdmin
LeftAndMain assumes tree_class exists, and tries to use it,
but causes a non-object error because of querying with a NULL
class name.
2013-02-04 14:49:51 +13:00
Sean Harvey
413cc0040e Fixing width of subsites dropdown to match default CMS menu width 2013-02-04 14:35:47 +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
ff32702cb9 Added composer.json 2013-01-03 14:55:25 +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
172752a9f4 NEW Access to non-public subsites for logged-in users
Also added caching subsite domain mapping
2013-01-03 14:10:32 +01:00
Ingo Schommer
18bcda48d3 BUG Allow usage of SubsiteTreeDropdownField when SubsiteID is set in PHP, not through CopyContentFromID dropdown 2013-01-03 14:10:30 +01:00
Ingo Schommer
25f83daf0e NEW Copy page to different subsite, select MasterPageID
This is also the only UI-facing way to set a master page
after the initial copy action when creating a new subsite.
Shows "edit" link when master page is already set.
2013-01-03 14:10:20 +01:00
Ingo Schommer
c952db1cb1 SubsiteCopyPagesTask 2013-01-03 14:10:14 +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
cac77703ed BUG Fixing FileSubsites failing when deleting ImageTracking 2012-11-07 14:25:32 +13:00
Sean Harvey
3d59f10331 Merge pull request #63 from mateusz/top-level
BUG Switch the subsite on GET parameter only.
2012-11-04 17:31:37 -08:00
Sean Harvey
dafeea9d50 Merge pull request #64 from mateusz/files-augment
BUG Flip the conditional to restore the original intention.
2012-11-04 17:30:34 -08:00
Sam Minnee
d043328545 Added composer file 2012-11-03 13:03:41 +13:00
Mateusz Uzdowski
20ae380350 BUG Flip the conditional to restore the original intention.
The original intention was to skip if ImageTracking was found, but it
got broken on c9d3a1f8.
2012-11-02 15:32:31 +13:00
Mateusz Uzdowski
2488489e22 BUG Switch the subsite on GET parameter only.
This fixes the bug where creating the top level pages is broken whenever
subsites module is installed. This is because the SubsiteID is
explicitly specified on AddForm POST submission, which incorrectly
triggers a redirect from LeftAndMainSubsites::init and the form action
never has a chance to execute.

Also do not look at POST when checking for the current subsite ID.
2012-10-26 11:53:40 +13: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
5e1906c9f4 BUG Fixing use of FormResponse, use X-Status header instead 2012-10-12 12:06:09 +13:00
Sean Harvey
488ea71c45 Removing unncessary end PHP tags from subsites code 2012-10-12 11:08:24 +13:00
Sean Harvey
6747ba65bb Fixing LeftAndMainSubsites using deprecated Director::redirect() 2012-10-12 11:06:23 +13:00
Sean Harvey
19a904d1d2 LeftAndMainSubsites failover if map() returns an array instead of an SS_Map 2012-10-12 11:05:00 +13:00
Sean Harvey
070eaf54ae Fixing deprecated call to Director::redirect() 2012-10-11 15:16:38 +13:00
Sean Harvey
d4df26db72 BUG Fixing correct URL location to pages 2012-10-10 13:49:08 +13:00
Hamish Friedlander
68bc12d74a Merge pull request #51 from silverstripe-rebelalliance/3.01
Merge in beta changes for compatibility with SilverStripe 3.0.1
2012-08-06 18:35:26 -07:00
Kirk Mayo
e7c5dd5d93 BUG: Fixing creating subsites from templates trac/7318 2012-07-18 12:21:35 +12: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
UndefinedOffset
598b0253f5 BUG: Coding convention updates 2012-07-16 11:21:30 +12:00
Ed
c9d3a1f854 BUG: More SS 3.0 modifications
Fixes for SS 3.0 beta 3

Fixed compatibility issues with ss3.0 rc1

fixed potential issue caused by the from array format changing in 3.0

Fixed strict standards warnings

Fixed strict notice "Only variables should be passed by reference"

Fixed strict notice "Only variables should be passed by reference"

Fixed strict notice caused by SubsiteAdmin not declaring all of the properties for getCMSFields()

Made Subsite::accessible_sites() static

Fixed issue caused when trying to add a domain before saving for the first time

Fixed undefined property ParentID
2012-07-16 11:21:24 +12:00
Ed
a2b612570b MINOR: Replaced deprecated extraStatics() with static variables 2012-07-16 11:18:44 +12:00