Commit Graph

2238 Commits

Author SHA1 Message Date
Damian Mooyman f17fad179f Merge 3.3 into 3.4
# Conflicts:
#	code/Report.php
2016-08-05 16:48:52 +12:00
Damian Mooyman c54b8b5a6c Fix link formatting 2016-08-01 16:51:21 +12:00
Damian Mooyman d2142f252e Fix psr-2 formatting 2016-08-01 16:51:21 +12:00
Paul Clarke f04975c64e Remove additional title and move actions to top 2016-08-01 16:47:38 +12:00
Paul Clarke 9fdf236611 Add new styling for links in gridfield 2016-08-01 16:47:08 +12:00
Damian Mooyman 9d31bb0542 BUG Fix broken form actions on parent and nested gridfields 2016-08-01 16:35:37 +12:00
Damian Mooyman 87477a1e01
BUG Fix incorrect url manipulation
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1183
2016-07-21 18:06:19 +12:00
Daniel Hensby 761cbf0dc2
FIX Use new admin_url 2016-07-18 13:06:49 +01:00
Daniel Hensby c876a21669
Merge branch '3' 2016-07-18 13:02:20 +01:00
Damian Mooyman 2d47fed75d Fix ReportAdmin::Link() not returning correct home url (#38) 2016-07-14 17:51:20 +12:00
Damian Mooyman 39b6d12969 API Apply SilverStripe\Security namespace (#35) 2016-07-07 13:43:27 +12:00
Damian Mooyman ab81961115
API Apply SilverStripe\ORM namespace 2016-06-23 17:32:58 +12:00
Daniel Hensby 68c4040299
FIX No longer hardcoding admin links 2016-06-09 13:40:29 +01:00
Ingo Schommer b63600c392 Remove triple report titles 2016-05-10 22:24:40 +12:00
Daniel Hensby a39515357d
Merge branch '3' 2016-04-26 02:32:15 +01:00
Daniel Hensby b985ce0eba
Merge branch '3.2' into 3.3 2016-04-26 02:29:59 +01:00
Daniel Hensby b1566f3e79 Decoupling from CMS module 2016-03-21 12:15:27 +00:00
Daniel Hensby 57cfe3c66a FIX Bad joining of links in reports 2016-03-18 11:03:26 +00:00
Damian Mooyman f777f36c68 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	code/Report.php
#	composer.json
#	tests/ReportTest.php
2016-01-25 16:20:10 +13:00
Damian Mooyman fb3083688e Merge remote-tracking branch 'origin/3.2' into 3
# Conflicts:
#	.travis.yml
#	composer.json
2015-12-22 14:21:03 +13:00
Damian Mooyman 36241d52a0 BUG Fix regressions is SS_Report::canView 2015-12-18 11:41:34 +13:00
Christopher Darling 5d0f833a39 FIX: SS_Report canView should check permissions
... checks for ADMIN / CMS_ACCESS_ReportAdmin (from ReportAdmin)

fixes #13
2015-12-17 12:27:54 +00:00
helpfulrobot 93fced94f1 Converted to PSR-2 2015-12-16 11:06:45 +13:00
Damian Mooyman 82eb191bf4 Restore deprecated reports 2015-11-10 17:16:21 +13:00
Damian Mooyman a09795b3a2 Merge remote-tracking branch 'origin/3' 2015-11-03 13:18:09 +13:00
Damian Mooyman 0d736d0f3e Merge remote-tracking branch 'silverstripe-cms/3.1' into 3.2
Conflicts:
	.gitignore
	.travis.yml
	README.md
	_config.php
	composer.json
	javascript/ReportAdmin.js
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss
2015-11-03 11:11:58 +13:00
Christopher Darling 70dedf26e2 FIX: HtmlEditorConfig should be using content_css
as per https://github.com/silverstripe/silverstripe-framework/pull/4706
2015-10-26 11:04:44 +00:00
Patrick Nelson ff6c0a3160 FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing. 2015-10-08 17:48:31 -04:00
Stephen Shkardoon b87f5473d9 MINOR Change how OldPageRedirector gets URLs to fix nested redirects
Previously, we would be limited by the way allParams will return 3 parameters
 at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12:00
Loz Calver 718503edb1 Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
* antons--773-nested-virtual-pages-allowed_children:
  Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
Anton Smith c6684559f6 Issue #773 - $allowed_children not allowing nested virtual pages
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
Daniel Hensby 0759392980 Merge pull request #2 from sunnysideup/master
adding counts to report links
2015-07-22 13:23:52 +01:00
Peter Thaleikis 5663bd2116 fixing typo 2015-07-22 21:53:55 +12:00
Fred Condo f9cceaada0 Correct doubly-escaped " marks
The links in the Broken Links Report had extraneous " marks that made
them unusable. This fixes the links.
2015-07-01 17:42:26 -07:00
Loz Calver d78d325073 FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished (fixes #1230) 2015-06-26 10:47:39 +01:00
Daniel Hensby 524b36b75c Merge pull request #1213 from nglasl/3.1
FIX Enforced the published/draft selection for SS reports, which was bein…
2015-06-24 08:08:37 +01:00
Stephen Shkardoon b71a521c21 Fix incorrect permission check on duplicate()
Will now properly fall back to the canCreate() on the parent
2015-06-23 16:42:08 +12:00
Nathan Glasl 0de71d45db Enforced the published/draft selection for SS reports, which was being ignored due to previous code refactoring. 2015-06-22 16:05:13 +10:00
Daniel Hensby 0b92a61e51 Updating docs link in default install
Fixing the default Content for Homepage to link to docs.silverstripe.org (there's an "s" at the end of "docs")
2015-06-18 16:47:10 +01:00
Daniel Hensby e9fde144eb Merge pull request #1201 from scott1702/update-content
Update default home content
2015-06-17 15:40:17 +01:00
scott1702 60c68098eb Update default home content 2015-06-17 13:04:29 +12:00
Jonathon Menz dbe2ad4f9f FIX: Folder expansion icons
This is a companion fix for https://github.com/silverstripe/silverstripe-framework/pull/4202
2015-05-29 08:43:44 -07:00
Ingo Schommer 221281dade Merge pull request #1181 from dhensby/pulls/injector-searc-form
FIX Use SearchForm::create to instantiate SearchForm
2015-04-29 00:11:52 +12:00
Nik Rolls 5163690bdc PHPDoc improvements for SiteTree and SiteTreeLinkTracking
- Removed @param/@method references to fields from extensions
- Added @mixin references to extensions
- Fixed incorrect PHPDoc @params and @returns
- Fixed wrapping width on many docblocks
- Added and/or improved method documentation when missing or confusing
- Fixed typos as found
2015-04-20 20:59:52 +12:00
Michael Strong 5ab15da8fe Concat links in "broken links" report (fixes #1117)
Fixes operation with any modules that add GET parameters to CMS links,
such as the Translatable module.

Pull request by @micmania1, see https://github.com/silverstripe/silverstripe-cms/pull/1118.
Modified by @chillu based on peer review feedback.
2015-04-19 22:39:57 +12:00
Colin Tucker 02fcf6429b Issue #1150: Removed Save and Delete buttons from regular edit form. 2015-04-17 09:19:15 +10:00
Daniel Hensby a71f5f99fa FIX Use SearchForm::create to instantiate SearchForm 2015-03-31 17:03:17 +01:00
Damian Mooyman a84361e4e8 Ensure SiteConfig::canView 2015-03-19 16:16:54 +13:00
Damian Mooyman 3df41e1176 BUG Fix SiteTree / SiteConfig permissions 2015-03-19 15:29:38 +13:00
Damian Mooyman cabd8bbab9 Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting
FIX: VirtualPages use correct casting for 'virtual' database fields
2015-03-06 11:29:18 +13:00
Daniel Hensby fe8cbc89d4 Remove double escaping of report data 2015-02-08 02:11:17 +00:00
Daniel Hensby a530085016 FIX External redirects shouldnt show in preview pane 2015-02-08 00:30:38 +00:00
Michael Strong 7733c4335e BUG Correctly sanitise Title 2015-01-22 17:54:05 +13:00
Stephen McMahon 9d888d5dde BUG: Fixed SearchForm not calling getTemplate() in forTemplate() 2014-12-02 15:13:42 +11:00
Loz Calver a142ffd465 FIX: VirtualPages use correct casting for 'virtual' database fields 2014-11-17 15:44:17 +00:00
Daniel Hensby dd0332d66d Merge branch 'guywatson-patch-1' into 3.1 2014-11-03 23:06:38 +00:00
guywatson d2f0eafa27 Add an extension hook to the getIsModifiedOnStage method 2014-11-03 23:04:28 +00:00
Sean Harvey 56142b8bba BUG sprintf missing on exception in SilverStripeNavigator 2014-11-03 14:09:27 +13:00
micmania1 8310135923 FIX Broken links on dependent pages tab 2014-10-23 21:53:12 +00:00
Daniel Hensby 89184a8134 Implement `TemplateGlobalProvider` on `SiteConfig`
Seeing as the `SiteConfig` is a site wide and "global" object, it makes sense to have it universally available to the templates
2014-08-22 14:28:19 +01:00
Damian Mooyman 13565a5e90 BUG Fix sorting on main ReportAdmin grid ref: CWPBUG-133 2014-08-14 10:08:11 +12:00
Sean Harvey 796874dae7 Merge pull request #1017 from tractorcow/pulls/3.1/fix-report-sorting
BUG Fix sorting on main ReportAdmin grid
2014-08-13 10:52:51 +12:00
madmatt 4e5b1966d3 Fix changed pages filter to match SiteTree's 'MODIFIED' label 2014-08-07 16:48:06 +12:00
Damian Mooyman 53dbbb7982 BUG Fix CMSMain::getList to correctly respect filter result
Fixes #1064
CMSSiteTreeFilter refactored to allow SS_List of filtered pages to be returned
2014-08-06 15:00:48 +12:00
Damian Mooyman 1c48cb6aae BUG Fix search range for asset filter 2014-08-06 13:26:23 +12:00
Jakx.nz 20df063f43 #1067 No updateEditForm hook on CMSFieldAddController::getEditForm() 2014-08-01 10:37:11 +12:00
Stig Lindqvist 482c23f18e NEW Adding CMS sitetree filter to see the current 'live' site
This adds a new filter that will show a content editor what the current published site-tree
looks like for a visitor. This helps when there is a lot of drafted content that get included
in the default filter 'All Pages'
2014-07-29 13:12:36 +12:00
Stig Lindqvist 45046f08e8 Bug: CMS tree filters doesn't count the correct number of children for deleted pages
This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.

This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.

The solution involves a couple of smaller fixes in both CMS and framework modules.

1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter
2014-07-25 16:18:54 +12:00
Simon Welsh 6a0366fb84 Merge pull request #1060 from stojg/pull/search-for-date
BUG: Narrowing site tree search to one date shows no pages
2014-07-24 13:32:31 +10:00
Stig Lindqvist 3eefd65f7c BUG: Narrowing site tree search to one date shows no pages
It turns out that the search doesn't work if you put the same date into both start and end date. Adding
time to the query seems to fix this issue.
2014-07-24 15:24:03 +12:00
Will Rossiter a777266e43 FIX ensure controller stack is updated when execution halted by an exception.
See: https://github.com/silverstripe/silverstripe-framework/issues/2467

popCurrent would be incorrectly not pop a controller from the controller stack if an exception was throw from inside the handleRequest() method.

This change captures the exception, ensures the controller is popped from the stack and passes the exception along.
2014-07-01 14:18:53 +12:00
Rodney Way 1e194854e0 BUG: Ensure that all child pages are deleted (regardless of ShowInMenu status) under enforce_strict_hierarchy.
Also updated SiteTree YML test data to match.
2014-06-24 13:29:16 +10:00
Damian Mooyman b8d19ba495 BUG Fix deleted pages redirecting the CMS
Update behat tests for Mink 1.6 compatibility
2014-06-17 10:36:08 +12:00
Damian Mooyman 7277dc1600 BUG Fix sorting on main ReportAdmin grid
ref: CWPBUG-133
2014-05-15 14:49:41 +12:00
Damian Mooyman 3162d0e664 API Update ErrorPage to respect new HTTP Error codes 2014-05-06 15:29:33 +12:00
Damian Mooyman f9cb8805e1 API Error page support for Security controller errors 2014-05-05 17:13:11 +12:00
Mateusz U fcb6a9140c Merge pull request #1004 from tractorcow/pulls/sitetree-title
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 14:37:29 +12:00
Damian Mooyman 341eeb7c31 Merge pull request #998 from kinglozzer/pulls/sitetree-file-linktracking
FIX: Broken file link tracking (fixes #996)
2014-04-29 09:36:36 +12:00
Damian Mooyman 89fbae2c2e BUG Fix encoding of SiteTree.MetaTags 2014-04-29 08:54:17 +12:00
Ingo Schommer 9bff36c078 Merge pull request #994 from tractorcow/pulls/3.1-asset-datefilter
API Filter by date created for files
2014-04-28 23:40:17 +12:00
Ingo Schommer 66919ed0cc Merge pull request #1003 from tractorcow/pulls/3.1-configurable-paging
API Ability to configure paging for assets / pages
2014-04-28 23:06:47 +12:00
Loz Calver 396fd9a86e FIX: Broken file link tracking (fixes #996) 2014-04-28 09:26:34 +01:00
Damian Mooyman 0285322049 API Ability to configure paging for assets / pages
ref: CWPBUG-143
2014-04-28 15:22:17 +12:00
Russell Michell a502c9d21c NEW Fixes #966. Ability to filter pages on page status.
- New filters for statuses normally found through SiteTree::getStatusFlags().
- Refactored menu sorting. Now alphabetical, as it wasn't previously.
2014-04-28 14:50:07 +12:00
Damian Mooyman 3765030faa API Filter by date created for files
Added test cases
Do not merge before https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/32

ref: CWPBUG-144
2014-04-15 09:42:53 +12:00
Damian Mooyman baff7f12bd Merge pull request #968 from phptek/issue/965
FIX Fixes #965. Allow user date-settings to show on GridField Page admin
2014-04-10 14:21:08 +12:00
Damian Mooyman 3204ab5af3 BUG Fix orphaned pages reporting they can be viewed 2014-04-07 12:52:07 +12:00
Damian Mooyman ab78198946 Merge pull request #979 from ss23/SS2014005-3-1
FIX Do now allow arbitary class creation in CMS
2014-03-27 12:55:40 +13:00
Stephen Shkardoon a67ed2799d FIX Do now allow arbitary class creation in CMS 2014-03-19 19:27:39 +13:00
Stephen Shkardoon 8e50405871 FIX Prevent SQLi when no URL filters are applied 2014-03-19 19:05:13 +13:00
Russell Michell b4a1aa4537 FIX Fixes #965. Allow user date-settings to show on GridField Page admin
- Relies on framework PR #2961.
2014-03-17 10:40:08 +13:00
Simon Welsh 403b47fe6c Merge pull request #951 from sheadawson/950-fileexists
FIX fileexists check
2014-03-16 20:29:12 +13:00
Simon Welsh 2503d1dca2 Merge pull request #911 from chillu/pulls/908-all-sections-canedit
Page edit access with CMS_ACCESS_LeftAndMain (fixes #908)
2014-03-16 20:12:15 +13:00
Simon Welsh 5024a48f89 FIX: Reports with Parameter fields override ReportTitle and ReportDescription
Fixes #696
2014-03-16 19:09:47 +13:00
sheadawson dc865399dc FIX fileexists check via ajax didnt know what folder the file was being uploaded to. Fixes #950 2014-02-20 15:17:04 +11:00
Hamish Friedlander 224033e518 FIX Limit ExtraMeta to only allow meta and link elements 2014-02-17 12:08:09 +13:00
Gus King 7b4cc316ef Numerous PHPDoc fixes. 2014-02-10 15:35:13 -05:00
Gus King 457cadb103 Documented magic properties/methods of SiteTree and SiteConfig. 2014-02-09 19:13:04 -05:00
Ingo Schommer 1f17f4320d Page edit access with CMS_ACCESS_LeftAndMain (fixes #908)
"Access to all sections" implies edit access in the CMS
2013-12-13 10:05:06 +01:00
Martijn dec2be38fa use Controller::join_links() for listview links
This fixes incorrect adding of the locale parameter when using translatable :

http://site.com/admin/pages/edit/show?locale=nl_NL/11
2013-12-06 15:45:15 +01:00