Werner M. Krauß
a4a1ab6a78
formatting code
2017-06-01 15:57:53 +02:00
Werner M. Krauß
55c7240425
fixing code analysis: simplify if statements
2017-06-01 15:56:28 +02:00
Werner M. Krauß
9673c881c1
fixing code analysis: simplify if-return statements
2017-06-01 15:48:01 +02:00
Werner M. Krauß
9d3c4506af
fixing code analysis: fix parameter in method call
2017-06-01 15:43:30 +02:00
Werner M. Krauß
25754e1158
fixing code analysis: updating phpdoc
2017-06-01 15:32:45 +02:00
Werner M. Krauß
17010f39a3
fixing code analysis: removing unneeded else statements
2017-06-01 15:32:44 +02:00
Werner M. Krauß
abe1ac9fe6
fixing code analysis: replacing deprecated methods
2017-06-01 15:32:38 +02:00
Werner M. Krauß
4fc13b19f7
fixing code analysis: removing unnecessary parenthesis
2017-06-01 15:32:36 +02:00
Werner M. Krauß
e7ad086641
fixing code analysis: safely use single quotes
2017-06-01 15:32:30 +02:00
Werner M. Krauß
76852594a8
fixing code analysis: public method and case mismatch
2017-06-01 15:31:30 +02:00
Werner M. Krauß
e86cc55ba6
fixing a PHP7 only statement to be 5.6 compatible
2017-06-01 14:43:25 +02:00
Werner M. Krauß
e03e7d9ce9
fixing a namespaced ORM call
2017-06-01 14:42:56 +02:00
Werner M. Krauß
6f1e1ab953
SubsiteVirtualPage: SubsiteID should not be a virtual field
2017-05-30 21:43:37 +02:00
Werner M. Krauß
f348f5fa97
fix SiteConfigSubsites AugmentSQL: get the right table name to filter
2017-05-30 20:50:52 +02:00
Werner M. Krauß
997459caf3
Get some more tests working
...
Updating config and i18n calls
2017-05-30 20:50:22 +02:00
Werner M. Krauß
e2bdd5ca41
fixing tests: adjusting yml file, update Config::modify usage
2017-05-30 15:14:28 +02:00
Tim Kung
5d3af16aaf
- namespacing all classes
...
- moving all phpunit tests into tests/php
- moving all extensions from _config.php into config.yml and removing obsolete _config.php
- moving GridFieldSubsiteDetailForm_ItemRequest into own file
(cherry picked from commit ee02828)
2017-05-30 15:13:40 +02:00
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ß
c5f507b3f9
reformat code and tests
2017-05-24 15:26:28 +02:00
Werner M. Krauß
ef602abe47
replace config::inst()->update() with config::modify->set()
2017-05-24 15:20:51 +02:00
Werner M. Krauß
a49189ef58
fix removed i18n::get_common_locales()
2017-05-24 15:09:13 +02:00
Werner M. Krauß
a7ef6472ee
db query fixes
2017-05-24 14:55:03 +02:00
Werner M. Krauß
b71e544820
adding table names config
2017-05-24 14:31:56 +02:00
Werner M. Krauß
fe6d93eaac
fixing double use declarations of Subsite class
2017-05-24 14:31:36 +02:00
Werner M. Krauß
2c3b5bf5af
remove VirtualPageController usage
2017-05-24 13:42:53 +02:00
Werner M. Krauß
e33a5b4cae
upgrader: upgrade code
2017-05-24 13:36:04 +02:00
Werner M. Krauß
2c84e627db
upgrader: namespacing classes
2017-05-24 12:32:05 +02:00
Loz Calver
e8f5f58bb0
SS4 namespaces compatibility
2016-09-23 09:34:23 +01:00
John Milmine
3587bc666f
made duplication between subsites more robust
...
and added some extra methods so it's easier to overwrite or extend
2016-03-22 21:55:11 +13:00
Damian Mooyman
7ee8bdbf72
Merge pull request #176 from jason-zz/patch-1
...
Update SubsiteDomain.php
2016-02-04 17:26:56 +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
5e18e8dca3
Merge remote-tracking branch 'origin/1.1'
...
Conflicts:
.travis.yml
2015-11-13 19:06:09 +13:00
Damian Mooyman
c22c8dc810
Merge remote-tracking branch 'origin/1.0' into 1.1
...
Conflicts:
code/extensions/LeftAndMainSubsites.php
tests/SiteTreeSubsitesTest.php
2015-11-13 19:02:12 +13:00
Ingo Schommer
cf534aad31
BUG Subsites selection on SubsitesVirtualPage ( fixes #45 and #47 )
2015-11-13 17:31:44 +13:00
Will Rossiter
b979b38694
FIX : #138 allow subsite summary fields to be customized
2015-10-21 09:09:10 +13:00
Will Rossiter
9c9e0bfa94
Correct link to editing a subsite virtual page.
2015-07-27 10:57:10 +12:00
wernerkrauss
996abfcc58
Wrong edit link in SubsitesVirtualPage
...
In SS3.1 we have /admin/pages for cms, was still old link.
2015-06-17 16:30:56 +02:00
Christopher Pitt
750cdbcff9
3.2 compat changes
2015-06-09 10:50:43 +12:00
Ingo Schommer
5604879146
4.x core compat
2015-04-30 22:39:22 +12:00
Damian Mooyman
5b9af35566
Use 3.2 compatible API
2015-02-24 09:34:34 +13:00
Damian Mooyman
e6c8dff7be
Merge remote-tracking branch 'origin/1.0'
...
Conflicts:
.travis.yml
code/extensions/LeftAndMainSubsites.php
composer.json
2015-02-24 09:12:38 +13:00
micmania1
3ca2861c2d
FIX: Removed unnecessary redirect. This is early enough in the script that the correct subsite will be used from hereon.
2015-02-17 01:13:56 +00:00
Jason
d99785d773
Update SubsiteDomain.php
...
Add $default_sort.
2014-12-17 10:44:43 +11:00
John Milmine
91591a3752
redirect_fix_between_CMS_sections
...
previously if you were editing settings and you changed subsites ti would revert you to /admin, now it stays within your current controller
2014-11-24 15:32:05 +13:00
James Cocker
498d6e0619
Fixes #135 : LeftAndMain switching between subsites
...
When trying to switch to a different subsite from a page's editing view, it wouldn't switch. This was partly due to a $record always existing due to the homepage fallback on currentPageID : https://github.com/silverstripe/silverstripe-cms/blob/3.1/code/controllers/CMSMain.php#L816
So as currentPage() couldn't actually be used to test for the existance of a current page, I've added in a check for isset($this->owner->urlParams['ID']).
I've also moved the check for $_GET['SubsiteID’] which indicated a forced subsite switch (eg. via the dropdown switcher) above the check for a current page, as it should take precedence, and it wasn't being run when both conditions matched causing the subsite not to change.
Tested changing subsites from /admin/pages, from page edit view, from a page edit URL, and from other CMS sections such as Files and Security, and all seems to be working perfectly now.
2014-11-24 15:25:53 +13:00
Will Rossiter
0520b57f84
Merge pull request #145 from purplespider/patch-2
...
Fixes #135 : LeftAndMain switching between subsites
2014-11-24 15:11:12 +13:00
Damian Mooyman
a97b0d33eb
BUG Fix incompatibility with framework 3.2
2014-08-26 11:42:50 +12:00
Juul Hobert
2e32eab6ae
Bugfix for urls with %28 in the url
2014-08-22 13:21:18 +02:00
Shoaib Ali
1f2cb4380d
Removed hard coding of HTTP protocol
2014-08-18 21:03:52 +12:00