Commit Graph

119 Commits

Author SHA1 Message Date
Guy Marriott
3afdd01d41
Merge pull request #400 from creative-commoners/pulls/2.1/remove-json-methods
FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4
2018-10-29 11:46:16 +13:00
Robbie Averill
2a35a5c70a FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4 2018-10-28 21:41:32 +00:00
Robbie Averill
1fa549886f Define explode limit when removing port 2018-10-20 23:16:05 +02:00
Robbie Averill
ff9997e0f2 FIX Ignore ports when matching domain for subsite 2018-10-19 20:51:43 +02:00
Robbie Averill
bf7dd9c37b Merge branch '2.1'
# Conflicts:
  #	src/Extensions/SiteTreeSubsites.php
2018-10-19 16:28:50 +02:00
Robbie Averill
9199d509d6 Merge branch '2.0' into 2.1 2018-10-19 16:27:38 +02:00
Guy Marriott
7cc86199e7
Revert "FIX CMS permission checks for subsite are now handled in the state context" 2018-10-19 12:00:50 +13:00
Robbie Averill
1a5666182e
Merge pull request #396 from open-sausages/pulls/2.0/352-fix-migrate-file-task
BUG: Fix `MigrateFileTask` not migrating files for subsites
2018-10-18 11:37:21 +02:00
Robbie Averill
2a6f7b5dfb Automated linting fix 2018-10-18 11:03:16 +02:00
bergice
e52fe41a23 BUG: Fix MigrateFileTask not migrating files for subsites
Fixes #352
2018-10-18 18:41:07 +13:00
DorsetDigital
1e458ef03d
Change source of admin URL in getIsAdmin()
As per #394 
Change direct call to the AdminRootController config setting, using instead the admin_url() method on the class which provides detection via the Director rules, and the fallback to the config setting.
2018-10-17 23:20:20 +01:00
Dylan Wagstaff
4323db52f0
Merge pull request #391 from creative-commoners/pulls/2.1/duplicate-tabs
FIX Remove duplicate Configuration tabs when creating a new subsite
2018-09-14 19:55:33 +12:00
Robbie Averill
bb226a0652 FIX Remove duplicate Configuration tabs when creating a new subsite 2018-09-14 09:42:29 +02:00
Robbie Averill
313d22ffca FIX Only continue delegation when DB exceptions are caused by no database selected
This prevents the middleware from interrupting legitimate database exceptions from being
propagated.
2018-09-07 11:06:55 +02:00
Robbie Averill
7681634cb2 Remove irrelevant check for subsites list size, use func_num_args() and add break to loop 2018-08-27 10:04:57 +12:00
Robbie Averill
6af985420f FIX CMS permission checks for subsite are now handled in the state context
We now check the subsite state for the context and validate it against the current member's
group permissions using the SilverStripe ORM relationships instead of using SQL queries.

More granular permission checks e.g. canView etc are still up to data models to define and
handle.
2018-08-24 16:58:36 +12:00
Robbie Averill
e8a72e1c33 FIX Duplicate page's parent IDs are now assumed or zeroed after duplication 2018-08-24 10:30:27 +12:00
Robbie Averill
8af796fa7a API Deprecate duplicateSubsiteRelations. Use "cascade_duplicates" config API instead. 2018-08-24 10:13:22 +12:00
Robbie Averill
7f28c32427 FIX Pages now correctly duplicate children across subsites 2018-08-24 10:12:05 +12:00
Robbie Averill
6747b5ffe8
Merge pull request #381 from lekoala/patch-1
allow disabling filter using queryParam
2018-08-24 08:50:47 +12:00
Thomas Portelange
6e35807dc7
allow using queryParam to disable filter
much better than global state (and should potentially replace cookie usage that is user controlled)
2018-08-16 16:20:48 +02:00
Thomas Portelange
c177a9f640
allow disabling filter using queryParam
It is much better than relying on global state
2018-08-16 16:19:25 +02:00
Robbie Averill
d8088edfa9 Merge branch '2.1' 2018-07-26 15:15:29 +12:00
Robbie Averill
4b6804eaab [SS-2018-016] Group table name is escaped to prevent possibility of SQL injection 2018-07-16 11:22:58 +12:00
Dylan Wagstaff
ffbcb9a0c8 Deprecate alternatePreviewLink function as per CMS
SilverStripe CMS 4.0.0 issues a deprecation notice before calling
alternatePreviewLink on any page that hasMethod (i.e. is applied via an
extension such as SiteTreeSubsites). Instead of double-issuing a notice,
we will just mark this as deprecated in the next minor version via
docblocks.
2018-07-05 09:55:45 +12:00
Dylan Wagstaff
5370bc8af6 FIX apply SubsiteID getVar to CMS Preview fetches
A preview link must be loaded on the same domain the CMS is loaded
through, which was previously causing issues when a page (identified
via URLSegment) did not exist on the subsite domain. By _always_
prepending the identifier to the preview link, this should never happen.
2018-07-04 15:21:47 +12:00
Robbie Averill
153db12d42 Switch count for exists() check for readability 2018-06-20 09:27:04 +12:00
Dylan Wagstaff
f19b82f029
Merge pull request #369 from creative-commoners/pulls/2.0/fix-edit-check
FIX Do no provide input for canEdit or canPublish if no subsites exist
2018-06-19 17:04:15 +12:00
Robbie Averill
dc9d6de62d FIX Do no provide input for canEdit or canPublish if no subsites exist 2018-06-19 15:43:09 +12:00
Robbie Averill
315621892d FIX Double escaping subsites title in CMS menu 2018-06-19 13:47:15 +12:00
Dylan Wagstaff
875f5519ed
Merge pull request #361 from creative-commoners/pulls/2.0/canedit-fix
FIX Do not make subsite based file permission decisions when no subsite is set
2018-06-11 10:41:20 +12:00
Robbie Averill
b6ba567ee5 FIX Do not make subsite based file permission decisions when no subsite is set 2018-06-08 10:05:23 +12:00
Robbie Averill
8222f619f8 FIX Use correct table name for Group model when performing DB upgrades from older versions 2018-06-08 10:04:58 +12:00
Robbie Averill
94e88b5be9 Update createDefaultPages to use SubsiteState API 2018-05-04 14:04:50 +12:00
Robbie Averill
adc0395c25 Automated linting 2018-05-04 13:57:25 +12:00
Robbie Averill
cc064c43ce Merge branch '1' 2018-05-04 13:56:26 +12:00
Dylan
fe1c0a58c0
FIX be consistent with the variable setting
So as to avoid fatal errors while attempting to count.
2018-03-27 11:51:30 +01:00
Robbie Averill
30454dc04f FIX Support blacklist for SS 4.0 and 4.1, remove old Translatable reference in test class 2018-03-15 17:15:19 +13:00
Robbie Averill
afd23be64c FIX Correctly decode page type blacklist from JSON 2018-03-15 16:44:48 +13:00
Robbie Averill
f8f39c135f Merge branch '1' 2018-02-22 11:38:07 +13:00
Robbie Averill
ab24aa6d9f FIX Redirect user back to the full current URL after changing subsites 2018-02-08 00:23:00 +13:00
Raissa North
34c0c4946c FIX Hide subsite operations when no subsites exist 2018-02-01 15:41:54 +13:00
Raissa North
e405dff946 FIX Add an empty string to the subsite operations dropdown.
This prevents a subsite from being chosen as the default option, assuming this is undesired
2018-02-01 14:24:04 +13:00
Raissa North
809b1d9b85 Fix switch statement syntax and replace deprecated doPublish() method. 2018-02-01 13:24:48 +13:00
Raissa North
098660e27d Refactor GridFieldSubsiteDetailForm_ItemRequest and $_cache_accessible_sites
Remove underscores to comply with PSR-2
2018-02-01 13:22:48 +13:00
Raissa North
8b5f593999 Fix line length 2018-02-01 13:19:02 +13:00
Raissa North
db69c486a0 FIX: Turn SilverStripe Map into an array to give an accurate falsey value 2018-01-31 17:25:32 +13:00
Robbie Averill
34b3fbf04d FIX Subsites VirtualPage link to edit main page and TreeDropdownField API implementations 2018-01-30 16:21:45 +13:00
Robbie Averill
6fb0af0f93 FIX Typo in requirements call to TreeDropdownField javascript resource 2018-01-26 16:09:42 +13:00
Robbie Averill
6bbf988fda API Convert most of Subsite public statics to config properties 2018-01-23 12:09:48 +13:00
Robbie Averill
ace068b93d FIX Move extensions to correct folder location for PSR-4 compatibility 2018-01-18 16:23:11 +13:00
Robbie Averill
1dd1f2ce6c API Move subsite dropdown logic for folders into FolderFormFactoryExtension 2018-01-18 16:03:58 +13:00
Mike Cochrane
157db89dbf
Bugfix: Don't assume all forms have a URLSegment field 2017-12-14 14:17:30 +13:00
Robbie Averill
95a71566f1 NEW Convert to vendor module 2017-12-04 15:26:17 +13:00
Jason Irish
8fcfe55ba8 Subsite - allow canEdit to be extended 2017-11-22 12:22:57 -06:00
Daniel Hensby
7bf430ba83
Merge branch 'pull/322' 2017-10-11 16:17:20 +01:00
Mike Cochrane
1dcba49e5c SubsitesTreeDropdownField: Get the tree in the context of the correct subsite 2017-10-06 11:09:58 +13:00
Daniel Hensby
0157bd0c05 Merge pull request #321 from mikenz/resetable-state
Implement Resettable interface on SubsiteState so it gets reset between unit tests
2017-10-05 17:22:56 +01:00
Mike Cochrane
a2a86c6eb1 Implement Resettable interface on SubsiteState so it gets reset between unit tests 2017-10-05 04:52:53 +00:00
Mike Cochrane
7301099241 Add missing use lines, fix some class names, remove unused use lines 2017-10-05 03:09:47 +00:00
Robbie Averill
62df0b45a5 NEW Remove Subsite Configuration header, rename Main tab and remove Domains GridField title 2017-10-02 16:34:21 +13:00
Robbie Averill
9822807a58 FIX Add localisation for missing SITECONTENTLEFT and run text collector 2017-09-26 14:49:05 +13:00
Robbie Averill
961185a6fd FIX Make subsite configuration CMS fields header label translatable 2017-09-21 10:17:35 +12:00
Robbie Averill
95e437d828 FIX Update XHR controller hook selector and refactor getCMSFields to use scaffolding and separate tabs 2017-09-19 14:51:14 +12:00
Robbie Averill
0f5c6008e1 FIX PHPCS violation in Subsite 2017-09-13 09:06:47 +12:00
Will Rossiter
188b02df6b FIX Page type blacklist not matching classes correctly (Fixes 297)
Tidied up the UI, removed custom javascript in favour of core Toggle field.
2017-09-12 09:50:26 +12:00
prij
32385e580d Excluded colon from domain field validation 2017-09-12 07:20:42 +12:00
Robbie Averill
9bccfffe4e NEW Namespace translations, implement into class localisation calls 2017-09-11 11:50:49 +12:00
Robbie Averill
94755775ba Rename "code" to "src" for PSR-4 consistency 2017-09-11 11:44:52 +12:00