Commit Graph

41 Commits

Author SHA1 Message Date
Damian Mooyman
1f9fc33349 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	code/model/SiteTree.php
	code/model/SiteTreeLinkTracking.php
	tests/controller/CMSMainTest.php
2015-06-02 19:23:48 +12:00
Ingo Schommer
bb177249ba Merge pull request #1170 from tractorcow/pulls/3.1/cms-test
BUG Fix CMSMainTest attempting to render page on Security permission error
2015-04-29 00:12:47 +12:00
Damian Mooyman
cf4d9edafb Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	code/model/SiteConfig.php
	javascript/CMSMain.AddForm.js
	tests/model/SiteConfigTest.php
	tests/model/SiteTreeTest.php
2015-03-31 19:54:43 +13:00
Damian Mooyman
3df41e1176 BUG Fix SiteTree / SiteConfig permissions 2015-03-19 15:29:38 +13:00
Damian Mooyman
6c92a86d2e BUG Fix CMSMainTest attempting to render page on Security permission error 2015-02-24 17:27:48 +13:00
Damian Mooyman
638fb46407 Resolve merge regressions 2014-11-19 11:04:20 +13:00
Mateusz Uzdowski
52d297e6ef Merge remote-tracking branch 'origin/3.1' into merge-back
Conflicts:
	code/controllers/CMSSiteTreeFilter.php
	code/controllers/ReportAdmin.php
	code/reports/Report.php
2014-08-13 17:19:01 +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
a395c5322f API Move of codebase to parameterised query database abstraction layer
API Renamed DB static methods to properly conform to naming convention (lowercase, underscored)
API Replaced deprecated method
2014-07-07 15:07:37 +12:00
Stephen Shkardoon
a67ed2799d FIX Do now allow arbitary class creation in CMS 2014-03-19 19:27:39 +13:00
Ingo Schommer
1a48afd499 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 19:39:23 +02:00
Ingo Schommer
30cf08b27e CMSMain assertion fail due to escaping
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
2013-09-27 19:38:12 +02:00
Ingo Schommer
51c8e8639e API Marked statics private, use Config API instead (#8317)
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:21:04 +01:00
Hamish Friedlander
68ebc5d221 FIX CMSMainTest to access batch_action config property properly 2013-02-27 15:00:41 +13:00
Ingo Schommer
74d63791b7 Fixed regression in SiteTree->getCMSActions()
Caused by toolbar recent changes
2012-12-14 01:21:54 +01:00
Ingo Schommer
f9a5601fa3 BUG Enforce "add page" restrictions, improve UI (fixes #7879)
- Fix support for $allowed_children
- Added note when type selection is restricted
- Removed overly complex specs for "allowed children",
the data should be inferred from "disallowed children"
- Added support for SiteTree::$can_be_root
- Return raw JSON (not entity-encoded) from CMSMain->SiteTreeHints()
- Added tests for CMSMain->SiteTreeHints()
2012-12-03 16:52:17 +01:00
Ingo Schommer
76b99e4006 Fixed tests without assertions 2012-11-23 15:52:00 +01:00
Ingo Schommer
ff1df3696f Limiting redirection-follow to specific tests in CMSMainTest
Fixes *some* quirks when running tests with
the 'translatable' module enabled (which redirects
to URLs with ?locale=<locale> in the CMS by default).
2012-11-23 15:30:11 +01:00
Ingo Schommer
8659c27487 Remove unused set_up_once() invocations from various tests
SapphireTest method name was changed to instance method
and setUpOnce() naming in mid 2010 already (093da759).
Since those methods were never invoked, they're obsolete.
Checked that the SiteTree-related tests pass with
Translatable enabled.
2012-11-23 13:58:54 +01:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Ingo Schommer
1cd82e2db1 BUG Enforce $allowed_children in controllers on page creation (fixes #7694)
Original bug fix contributed by @kmayo-ss
2012-09-02 18:20:22 +02:00
Sean Harvey
0515555ab1 MINOR Fixing CMSMainTest using old code, updating to new CMS admin/pages URL 2012-05-22 17:35:04 +12:00
Sean Harvey
2cb89ed696 MINOR Fixing invalid URL 2012-05-22 17:16:29 +12:00
Sean Harvey
c72bae3a8e MINOR Fixing assertType() assertions with assertInstanceOf() 2012-05-09 23:06:55 +12:00
Sean Harvey
dedb9d0461 MINOR Removing use of _t() in test, assert the english text since en_US
is the locale set for tests by default.
2012-05-09 21:54:33 +12:00
Sean Harvey
46660e98bc MINOR Fixing broken test 2012-05-09 21:52:32 +12:00
Ingo Schommer
0e071c9393 MINOR Fixed tests broken by recent CMS search and breadcrumbs changes 2012-04-18 23:40:27 +02:00
Ingo Schommer
1b3a634a56 MINOR Fixed hardcoded links from admin/page to admin/pages 2012-04-18 23:33:37 +02:00
Ingo Schommer
dc0168d01b MINOR Removed $params argument to DataObject->getCMSFields(), please use FormScaffolder directly (fixes #7135) 2012-04-13 15:55:32 +02:00
Sean Harvey
ded3fd8d68 MINOR Fixed broken test from json changes 2012-03-30 16:25:21 +13:00
Ingo Schommer
4612b13d98 MINOR Fixed CMSMainTest to work with new breadcrumbs conventions (see 44a4e8a840) 2012-03-12 17:25:53 +01:00
Ingo Schommer
4225c0a966 MINOR Flattened AddForm and SiteConfig CMS logic, moved from base classes to specialised classes for better overview, and less inheritance where its not necessary. 2012-03-09 23:35:43 +01:00
Ingo Schommer
f620f9b46c MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons 2012-02-17 15:30:37 +01:00
Ingo Schommer
f88d4006f8 ENHANCEMENT CMSMain->Breadcrumbs() 2012-02-14 16:11:38 +01:00
Ingo Schommer
0bfd866623 MINOR Skip instanciation in CMSMainTest->testThatGetCMSFieldsWorksOnEveryPageType() when can_be_root is false (will fail the write call, not related to test) 2012-01-30 17:31:22 +01:00
Ingo Schommer
908a98b55b API CHANGE Default to /admin/pages rather than homepage edit view when CMS is first opened (#6762) 2012-01-24 14:20:55 +01:00
Stig Lindqvist
05e90838c0 API CHANGE Switch usage from FieldSet to FieldList 2011-10-27 20:24:45 +02:00
Ingo Schommer
8382ebb742 MINOR Using post() instead of submitForm() in CMSMainTest to work around SimpleTest issues 2011-07-08 15:36:31 +02:00
Ingo Schommer
9a09aaf42b ENHANCEMENT Changed CMSMain->AddForm() to a modal dialog, showing page types and their descriptions as radiobuttons rather than a dropdown 2011-04-28 22:49:34 +12:00
Ingo Schommer
f547da23a3 MINOR Relative $fixture_file links in cms/tests to facilitate moving files 2011-03-30 20:04:31 +13:00
Ingo Schommer
60abe5fb9f MINOR Moved files into a more logical structure in cms/code 2011-03-30 20:03:44 +13:00