Commit Graph

799 Commits

Author SHA1 Message Date
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
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
4ed41d6941 Fix tests covering old upload field behaviour 2014-06-18 09:14:47 +12:00
Damian Mooyman
519b0dfaa0 Merge remote-tracking branch 'origin/3.1' 2014-06-17 18:18:21 +12: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
Ingo Schommer
6ac4324eb3 Merge remote-tracking branch 'origin/3.1' 2014-06-16 08:45:30 +12:00
Ingo Schommer
e1f82aba49 Removed goutte driver from Behat, not supported
Was added way back with the original behat.yml, and then forgotten about
2014-06-16 08:39:54 +12:00
Damian Mooyman
1a85c7a1ec Merge pull request #1022 from silverstripe-iterators/pulls/redirector-proto-relative
Pulls/redirector proto relative
2014-06-13 16:01:20 +12:00
Damian Mooyman
cba0061fe2 Merge pull request #974 from micmania1/930-added-breadcrumbs-getter
API Added getBreadcrumbItems to SiteTree
2014-06-03 08:43:53 +12:00
Ingo Schommer
40f7a876d4 Support for protocol relative RedirectorPage.ExternalURL 2014-05-30 00:01:45 +12:00
Damian Mooyman
6a69134fb0 Merge remote-tracking branch 'origin/3.1' 2014-05-12 11:33:44 +12:00
micmania1
f46b6bde51 Added getBreadcrumbItems to SiteTree 2014-05-08 03:21:40 +01:00
Hamish Friedlander
435a5ee843 Merge pull request #1007 from tractorcow/pulls/3.1-security-errorpage
API Error page support for Security controller errors
2014-05-06 11:44:22 +12:00
Damian Mooyman
b3699281c0 Merge remote-tracking branch 'origin/3.1'
Conflicts:
.travis.yml
2014-05-06 10:24:28 +12:00
Damian Mooyman
f9cb8805e1 API Error page support for Security controller errors 2014-05-05 17:13:11 +12:00
Damian Mooyman
c5d5d10094 BUG Behat now uses explicit radio button behaviour 2014-05-05 12:46:57 +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
Loz Calver
396fd9a86e FIX: Broken file link tracking (fixes #996) 2014-04-28 09:26:34 +01: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
61ebe08437 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:10:49 +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
3204ab5af3 BUG Fix orphaned pages reporting they can be viewed 2014-04-07 12:52:07 +12:00
Damian Mooyman
ecda66a1c4 Merge remote-tracking branch 'origin/3.1' 2014-04-02 17:39:47 +13:00
Damian Mooyman
4b87b2e2e6 BUG Fix ContentControllerTest 2014-03-25 17:14:05 +13:00
Stephen Shkardoon
a67ed2799d FIX Do now allow arbitary class creation in CMS 2014-03-19 19:27:39 +13:00
Simon Welsh
b497b8f548 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	code/reports/Report.php
2014-03-18 09:23:39 +13:00
Simon Welsh
7002dcfa7f Assets table just shows the name, not the path 2014-03-18 08:56:41 +13:00
Simon Welsh
7f62cd3c88 Merge pull request #946 from srizzling/adminasset-filter
Adding AdminAssets filter Behat tests
2014-03-16 20:26:24 +13:00
Simon Welsh
f90f52f967 Merge pull request #921 from madmatt/pulls/behat-insert-links
Fix behat tests for insert-a-link.feature
2014-03-16 20:19:58 +13:00
Simon Welsh
de12aeb627 Merge pull request #920 from madmatt/pulls/behat-image-uploads
Fix behat tests for insert-an-image.feature
2014-03-16 20:19:42 +13:00
Simon Welsh
ebbb35d04f Merge pull request #919 from madmatt/pulls/behat-insert-image
Fix “I can insert an image from the CMS file store”.
2014-03-16 20:19:26 +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
Ingo Schommer
f6d929f05d Merge remote-tracking branch 'origin/3.1' 2014-03-13 13:40:32 +13:00
Ingo Schommer
dee64bbb2d Fixed behat image upload tests (contd.) 2014-03-13 13:39:59 +13:00
Ingo Schommer
702f6a2091 Merge remote-tracking branch 'origin/3.1' 2014-03-13 13:36:24 +13:00
Ingo Schommer
20605f7be0 Fixed behat image upload tests
Was using "File" class rather than "Image",
which broke HtmlEditorField->saveInto() with "unknown method getWidth()"
2014-03-13 13:35:41 +13:00
Sriram Venkatesh
3f28d72065 Adding AdminAssets filter Behat tests 2014-02-18 11:22:38 +13:00
Sam Minnee
d0a4fc2065 FIX: Fix failover to index template in ContentController::getViewer()
Historically, if you visit a foo action on Page, and Page_foo.ss doesn't exist, then it fails over
to Page.ss.  The introduction of ContentController::getViewer() broke this, but this patch adds a
test for this case and fixes it.

It was identified by build failures on silverstripe/userforms when tested against the master branch.
2014-02-14 17:44:53 +13:00
Sam Minnee
3aa95f4c83 Merge remote-tracking branch 'origin/3.1' 2014-02-14 14:05:05 +13:00
Sam Minnee
d69c8e5069 Minor improvement of theme switching test performance. 2014-02-14 13:43:34 +13:00
Sam Minnee
c0e6bf7132 FIX: Added proper state-restoration code to the ThemeContext: 2014-02-14 12:31:37 +13:00
Sam Minnee
ab4b72d486 FIX: Fixed testing of theme switching.
The previous theme test relied on the existence of the tutorial theme, which has been removed.
I'ved added a couple of behat rules for scaffolding fake themes, and altered the test to use these.
2014-02-14 12:14:20 +13:00
Ingo Schommer
5ebb484b20 Fixed ContentControllerTest 2014-02-07 15:56:20 +13:00
Ingo Schommer
683b099308 Merge pull request #914 from micmania1/900-page-templates-without-controller
NEW Locate page template without needing to define a controller
2014-02-07 14:20:30 +13:00
Ingo Schommer
172a1816f9 Merge remote-tracking branch 'origin/3.1' 2014-02-04 07:56:10 +13:00
Russell Michell
7d7c75414c NEW Track broken anchors 2014-01-31 12:44:59 +13:00
Mateusz U
5e79e66ccc Merge pull request #927 from halkyon/cmsmainsearch_test_fix
Fixing test not auto-following admin/pages/SearchForm
2014-01-16 16:45:00 -08:00
Sean Harvey
e9b10e5b16 Fixing test not auto-following admin/pages/SearchForm
With additional modules like Translatable, this test fails because
a 301 is issued to redirect the admin/pages/SearchForm request to the
correct URL containining a locale in the query string.
2014-01-17 12:57:28 +13:00
Mateusz U
b52002724e Merge pull request #926 from halkyon/virtualpage_extensions_fix
Fixing test failures introduced by Translatable and SiteTreeSubsites
2014-01-16 14:16:25 -08:00
Sean Harvey
93dca704fb Fixing test failures introduced by Translatable and SiteTreeSubsites
Same fix as e93abc6, except it applies to VirtualPageTest.
2014-01-17 10:36:00 +13:00
Sean Harvey
e93abc6eb2 Fixing test failures because of Translatable and SiteTreeSubsites 2014-01-16 11:36:25 +13:00
madmatt
938fb6f714 Fix behat tests for insert-a-link.feature
- Fix "I can link to a file" scenario.
- Fix "I can link to an anchor” scenario.
- Fix "I can edit a link” scenario.
- MINOR: Grammar fixes.
- Fix "I can remove a link” scenario.
2014-01-06 17:39:05 +13:00
madmatt
a1f02f80e0 Fix behat tests for insert-an-image.feature
- Fix “I can insert an image from the CMS file store”.
- Remove unused scenario (we no longer support adding multiple images at once from the CMS).
- Fix “I can edit properties of an image before inserting it” scenario.
- Remove “I can edit dimensions of an image before inserting it” scenario - these fields no longer exist.
- Add documentation to explain why this scenario is marked @todo.
2014-01-06 12:13:06 +13:00
madmatt
b097948568 Fix “I can insert an image from the CMS file store”. 2014-01-06 10:47:45 +13:00
micmania1
47582b3e3c getViewer will now locate and use the correct templates for pages which don't have their own controller 2013-12-20 20:52:11 +00:00
Ingo Schommer
07033548fc Merge remote-tracking branch 'origin/3.1' 2013-12-19 20:22:26 +01: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
Ingo Schommer
288303c43c Merge pull request #899 from mandrew/3.1
Adding behat test for changing theme of site using CMS dropdown
2013-12-12 11:34:47 -08:00
Ingo Schommer
87734cdfe1 Fixed ErrorPageTest Link() usage 2013-12-06 15:35:53 +01:00
Ingo Schommer
6403be518a Backwards compat OldPageRedirector
Regression from f972466880.
Passes tests in 3.1, but fails in master due to Deprecation notices.
Tests needed adjustments because OldPageRedirector::find_old_page()
doesn't have the same method signature...
2013-12-06 14:28:08 +01:00
Ingo Schommer
9ca336bea3 Merge remote-tracking branch 'origin/3.1' 2013-12-02 20:44:57 +01:00
Ingo Schommer
78b9ef2df3 More specific Behat assertion for page editability 2013-12-02 18:36:17 +01:00
Sriram Venkatesh
86301e627b NEW STEP: Pages editable by and renamed manage page permissions feature file 2013-12-02 12:47:04 +13:00
Sean Harvey
a79ac87e2b Fixing up scenarios for managing page permissions Behat tests.
Relies on changes from silverstripe-behat-extension:

silverstripe-behat-extension/pull/15
silverstripe-behat-extension/pull/14
silverstripe-behat-extension/pull/13
silverstripe-behat-extension/pull/12
2013-11-29 00:50:06 +01:00
Michael Andrewartha
c6b16061bb Adding behat test for changing theme of site using CMS dropdown 2013-11-21 11:18:05 +13:00
Will Rossiter
ddc2e3822b FIX: ErrorPage generating empty responses for 403/401 requests
Previously by setting the response status code inside the action, this prevented response bodies from being included due to 403/401 being matched by SS_HTTPResponse::isFinished() (which stops popular

I assume SS_HTTPResponse::isFinished() is valid for the permission error use case (and I would be hesitant to change it) so this simply moves the declaration of the response status code till after the parent has populated the body of the response.
2013-11-18 16:32:15 +13:00
Sriram Venkatesh
e444b359ec Implemented Behat test for page search (fixes #620)
Added Deleted state to UpdateState step defination
See https://github.com/silverstripe/silverstripe-cms/pull/896
2013-11-15 14:44:39 +01:00
Ingo Schommer
34c8fb22cb Convert behat PHP to SS coding conventions 2013-11-15 12:04:16 +01:00
Ingo Schommer
677f38227c Behat tests for image upload and overwrite in HTML editor 2013-10-24 14:49:51 +02:00
Ingo Schommer
ef0f633f46 Merge remote-tracking branch 'origin/3.1' 2013-10-23 14:53:33 +02:00
Mateusz U
27c8122123 Merge pull request #880 from halkyon/fulltextsearch_text
ContentControllerSearchExtensionTest doesn't clean up after itself.
2013-10-21 21:14:34 -07:00
Sean Harvey
ed8ee4e9b8 ContentControllerSearchExtensionTest doesn't clean up after itself.
The problem is FulltextSearchable::enable() does two things:
It enables the extension, as well as sets the MySQL create table option
to MyISAM. Later tests run with the extension enabled, because it doesn't
get removed at the end of the test, but the table type is set back to
InnoDB when the test is reset and schema recreated.

This produces side-effects where later tests in a suite tries to run
ALTER TABLE on File and add fulltext indexes when the table type
is set to InnoDB, causing an error.
2013-10-22 15:26:40 +13:00
Ingo Schommer
da1a875c4f Revert "Moved Behat reports tests to module"
This reverts commit 50a48aa25d.
The test in question relies on SiteTree data *as well* as the
reports module, so needs to be placed here.
2013-10-21 09:33:45 +02:00
Ingo Schommer
50a48aa25d Moved Behat reports tests to module 2013-10-21 01:00:29 +02:00
Ingo Schommer
16d8505bbb Merge remote-tracking branch 'origin/3.1' 2013-10-08 11:22:00 +02:00
Ingo Schommer
d532d05fc2 Moved manage-files.feature from framework
It relies on AssetAdmin which is placed in the 'cms' module
2013-10-08 11:20:50 +02:00
Ingo Schommer
f6c7bbb1ff Merge remote-tracking branch 'origin/3.1' 2013-10-08 11:17:14 +02:00
Ingo Schommer
c0cc517635 Migrated behat features from framework 2013-10-08 00:23:44 +02:00
Ingo Schommer
1a40994527 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
2013-10-06 19:07:52 +02:00
Ingo Schommer
0437c0597d More resilient Behat checks for "page not found"
Wrapping in a step to capture cases where the ErrorPage defaults
haven't been generated, and the default ModelAsController
message shows which is slightly different wording.
2013-10-02 17:12:43 +02:00
Ingo Schommer
2a4191d449 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-02 12:21:50 +02:00
Ingo Schommer
92e0c410b8 Fixed report link escaping 2013-10-02 12:19:23 +02:00
Ingo Schommer
52ab9e570a Fixed report link escaping 2013-10-02 12:01:34 +02:00
Ingo Schommer
fb9d7a595b FIX ReportAdmin report links regression
Regression from 79996a76fe,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
2013-10-02 11:50:00 +02:00
Ingo Schommer
64608ea622 Merge pull request #860 from ajshort/virtual-page-test-cache
Fix test sometimes using cached relationship object.
2013-10-02 02:44:28 -07:00
Andrew Short
1f4cdfced8 Fix test sometimes using cached relationship object.
In some circumstances, the CopyContentFrom page will be cached, so when
it is accessed the incorrect value was returned, meaning the test
would fail.
2013-10-02 15:03:50 +10:00
Ingo Schommer
956b6de05c Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-01 11:19:14 +02:00
Ingo Schommer
daf92e6ce0 FIX ReportAdmin report links regression
Regression from 79996a76fe,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
2013-10-01 11:17:36 +02:00
Ingo Schommer
7ec9596b99 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-30 22:44:44 +02:00
Ingo Schommer
cc2dcb2c4f Merge remote-tracking branch 'origin/3.1' 2013-09-27 19:44:03 +02: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
32478ab512 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
2013-09-27 19:07:13 +02:00
Ingo Schommer
8a96bab70d Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 18:50:52 +02:00
Ingo Schommer
fbb9a4449d Removed stale salad tests, got behat now 2013-09-26 10:53:19 +02:00
Ingo Schommer
16c802f7e1 More specific behat tree assertions 2013-09-14 00:21:29 +02:00
Ingo Schommer
7ec7a263c0 Behat scenarios for page permissions and search (steps only)
Actual step implementation not done yet
2013-09-13 18:46:23 +02:00
Damian Mooyman
5f828149c3 BUG Fixed instances of loosely defined SQL predicates not qualified by table name
Fixed duplicate SQL escaping on SiteTree::get_by_link
2013-08-29 13:59:45 +12:00
Ingo Schommer
c62f992dc3 Merge remote-tracking branch 'origin/3.1' 2013-08-22 13:56:28 +02:00
Ingo Schommer
ba57d42349 Merge remote-tracking branch 'origin/3.0' into 3.1.0
Conflicts:
	code/controllers/ContentController.php
	code/model/SiteTree.php
	tests/search/SearchFormTest.php
2013-08-20 20:59:44 +02:00
Ingo Schommer
1628cd130c Skip html entity SearchFormTest for PostgreSQL
Should be fixed, but its not trivial.
2013-08-20 16:56:24 +02:00
Ingo Schommer
7ad9712f05 Merge remote-tracking branch 'origin/3.1' 2013-08-16 13:37:49 +02:00
Hamish Friedlander
71608f0d4a FIX Add SiteTree link tracking as an extension, and apply to SiteTree itself 2013-08-09 11:46:32 +02:00
Simon Welsh
b1664f86a4 FIX Check for stage and drafts in SiteTree::canView() 2013-08-09 10:45:09 +12:00
Andrew Short
1710958207 Merge branch '3.1'
Conflicts:
	.travis.yml
	code/controllers/ReportAdmin.php
2013-07-09 13:54:05 +10:00
Hamish Friedlander
a5f00ae2c3 FIX Not checking stage in SiteTree#canView
SiteTree versions that arent the live version shouldnt be accessed by
regular users, but the logic to check that was split off into canViewStage,
which wasnt checked by code that isnt specifically SiteTree aware
(like RestfulServer)
2013-07-05 12:14:22 +12:00
Ingo Schommer
98750a9cf1 Merge pull request #772 from chillu/pulls/sitetree-urlsegment-votes
API SiteTree->validURLSegment() prioritizes extension votes
2013-06-25 02:18:08 -07:00
Ingo Schommer
f2a9f9aa0a ErrorPageTest: Reset env state
Otherwise SapphireTest will complain, see 0da70dafa457564a6adb02140ffeb5dd01f3a982
2013-06-19 13:17:22 +02:00
Ingo Schommer
a29ce594a1 Merge remote-tracking branch 'origin/3.1' 2013-06-19 11:17:57 +02:00
Jeremy Thomerson
b8908efdf7 ENHANCEMENT: allow sites to override meta generator tag 2013-06-17 20:35:14 +00:00
Ingo Schommer
0c4b2f8157 API SiteTree->validURLSegment() prioritizes extension votes
Tri-state, use NULL to ignore the extension result
2013-06-12 12:32:42 +02:00
Ingo Schommer
e9fe4f7c68 Behat: Removed unnecessary access-user-help.feature
It doesn't add much value in terms of testing
(can't see how we'd ever mess up the "Help" menu entry),
and it relies on the availability of an external resource
(userhelp.ss.org), making the tests more brittle.

It also breaks the feature following this one, because
somehow Behat doesn't reset the browser session, so
subsequent logins fail because a login still exists.
2013-06-07 11:42:02 +02:00
Ingo Schommer
5476bbeefb Behat: Fixed indentation (no functional changes)
Using tabs consistently
2013-06-07 10:21:05 +02:00
Stig Lindqvist
b3f31d8e6f Behat: New feature "Edit site wide title and tagline" #619 2013-06-07 17:46:37 +12:00
Mike Parkhill
ea29c1276b Behat: Adding user help scenario #607 2013-06-07 17:46:15 +12:00
Stig Lindqvist
08850da71e Behat: Type case in step definition 2013-06-07 16:17:44 +12:00
Stig Lindqvist
2a8307d794 Behat: Adding page publishing scenarios #616 2013-06-07 15:04:43 +12:00
Stig Lindqvist
a6be891214 Behat: Save draft notifications have changed 2013-06-07 11:40:46 +12:00
Ingo Schommer
df1836add2 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	tests/behat/features/edit-a-page.feature
	tests/behat/features/preview-a-page.feature
2013-06-05 14:39:21 +02:00
Ingo Schommer
d2105ef7a6 More verbose fixture step definitions
Too many clashes with other steps otherwise,
e.g. with 'And the preview contains "You can fill"'.
Also removed some duplicated code no longer necessary
because we use inheritance rather than composition
2013-06-05 14:25:29 +02:00
Ingo Schommer
8bd1e4373d Behat: Fixed spelling in test 2013-06-05 13:37:19 +02:00
Ingo Schommer
47d7a19a23 Behat: Replace @database-defaults with explicit fixtures 2013-06-05 13:30:15 +02:00
Ingo Schommer
e7cc08f6ae Behat: Auto-publishing SiteTree fixtures, RedirectorPage fixtures
They can be unpublished through an explicit step.
Extending from base FeatureContext in order to easily
share the same FixtureFactory but still add new blueprints to it.
2013-06-05 13:29:48 +02:00
Ingo Schommer
c21c9cba0d Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:10:26 +02:00
Simon Welsh
be25c302ac FIX Escape the sitetree_link shortcode return value 2013-05-10 14:05:06 +12:00
Sean Harvey
c7ebf76757 Page history panel: show appropriate message when viewing latest version 2013-05-07 17:14:28 +12:00
Ingo Schommer
2227ed3629 Merge remote-tracking branch 'origin/3.1' 2013-04-11 11:26:24 +02:00
Ingo Schommer
4087c14d1b Fixed behat tests 2013-04-09 09:38:46 +02:00
Will Rossiter
6e2906d01e API: remove static related classes, now staticpublisher module 2013-04-06 17:26:15 +13:00
Ingo Schommer
6457ab2433 Regression in URL generation (dots now filtered out)
Caused by framework/5ec85d06f68d09ab30b124312c54f1d84ce7d6f4
2013-04-02 11:39:46 +02:00
Ingo Schommer
8ae58398fe Simplified travis builds (using external script) 2013-03-28 23:48:37 +01:00
Ingo Schommer
1e117d22a0 Simplified travis builds (external setup scripts) 2013-03-28 22:36:05 +01:00
Ingo Schommer
b23c9bba82 Simplified travis builds (external setup scripts) 2013-03-28 21:15:11 +01:00
Ingo Schommer
51c00e33e6 Merge remote-tracking branch 'origin/3.1' 2013-03-27 12:12:21 +01:00
Ingo Schommer
f73a5c68f3 FIX VirtualPageTest memory errors due to Config API quirks 2013-03-27 10:59:17 +01:00
Ingo Schommer
8eb3840325 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
	tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01: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
1324024445 Hardcode travis branch on dependencies, otherwise breaks pull request builds
Pull requests are always on a branch, and this branch
typically is not present on the installer.

This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:19:21 +01:00
Ingo Schommer
c09bca6fac Merge remote-tracking branch 'origin/3.1'
Conflicts:
	lang/ja_JP.yml
	lang/lt.yml
	lang/pl.yml
2013-02-18 14:18:27 +01:00
Ingo Schommer
92db313ce7 Hardcode travis branch on dependencies, otherwise breaks pull request builds
Pull requests are always on a branch, and this branch
typically is not present on the installer.

This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:14:42 +01:00
Ingo Schommer
1ef155fc18 Hardcode travis branch on dependencies, otherwise breaks pull request builds
Pull requests are always on a branch, and this branch
typically is not present on the installer.

This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:13:24 +01:00
Ingo Schommer
8c3f87bb8a Results returned from FSP->publishPages()
Aids further processing and verbose display,
e.g. when the publication is triggered by a queuing mechanism.
2013-02-06 10:47:41 +01:00
Ingo Schommer
eba4d205c3 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 12:44:40 +01:00
Ingo Schommer
b15b98345f Using new "Security.login_url" configuration value 2013-01-29 18:06:49 +01:00
Ingo Schommer
8ab66c93b6 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/reports/Report.php
	composer.json
2013-01-21 11:24:05 +01:00
Will Rossiter
56346a50bf API: moved reports API to separate module 2013-01-17 21:58:03 +13:00
Ingo Schommer
8dd9bf3a1e Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-17 17:34:20 +01:00
Ingo Schommer
894d48789c String casting in SimpleXML tests for older phpunit versions 2012-12-17 17:32:46 +01:00
Ingo Schommer
a8478d2e46 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-14 10:55:51 +01:00
Ingo Schommer
74d63791b7 Fixed regression in SiteTree->getCMSActions()
Caused by toolbar recent changes
2012-12-14 01:21:54 +01:00
Ingo Schommer
611c3f1b2e Added travis environment info output 2012-12-12 15:14:11 +01:00
Ingo Schommer
df41fcdce4 Skip SearchFormTest if DB driver doesn't support fulltext
For now, the only case are specific SQL Server setups.
2012-12-11 15:18:58 +01:00
Ingo Schommer
084acc0fbd Fixed Behat tests for preview feature 2012-12-10 18:09:55 +01:00
Ingo Schommer
1bf67fd942 Merge remote-tracking branch 'origin/3.0' 2012-12-10 18:09:34 +01:00
Ingo Schommer
4fa4ae726b Adjusted Behat steps to new definition format 2012-12-10 15:38:32 +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
3512ee82f4 Merge remote-tracking branch 'origin/3.0' 2012-11-28 16:36:30 +01:00
Ingo Schommer
e5f206065e Using $TRAVIS_BRANCH again, since its now available on travis-ci.org 2012-11-28 16:33:50 +01:00
Ingo Schommer
7bd200f2db Re-adding usage of $TRAVIS_BRANCH, fixing wrong 3.0 dependency
Probably caused by a merge from 3.0
2012-11-28 16:14:01 +01:00
Sean Harvey
e5b2643a11 Merge branch '3.0' 2012-11-26 17:19:14 +13:00
Kirk Mayo
40a1a35618 BUG Namespaces for CmsFormsContext and CmsUiContext are wrong 2012-11-26 01:16:02 +01:00
Kirk Mayo
670c579153 BUG Namespaces for CmsFormsContext and CmsUiContext are wrong 2012-11-26 11:49:51 +13:00
Ingo Schommer
8d5cea550c TRAVIS_BRANCH doesn't seem to be set in before_script, hardcoding 2012-11-23 16:31:51 +01:00
Ingo Schommer
e67474293f More verbose travis build process 2012-11-23 16:20:14 +01:00
Ingo Schommer
b42cb5c308 Passing through $TRAVIS_BRANCH to before_script 2012-11-23 16:10:07 +01:00
Ingo Schommer
47e14f5e56 Fixed $TRAVIS_BRANCH env var usage in before_script
Fixes "class TableListField not found" errors in travis.
Before that, we've been testing the 3.0 cms with
master framework, which of course is a bad idea ;)
2012-11-23 15:59:01 +01:00
Ingo Schommer
76b99e4006 Fixed tests without assertions 2012-11-23 15:52:00 +01:00
Ingo Schommer
26bdee4f08 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	tests/model/SiteTreeTest.php
2012-11-23 15:31:03 +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
e6e12fe00e Merge branch '3.0'
Conflicts:
	composer.json
2012-11-22 23:48:18 +01:00
Ingo Schommer
20a817875a Shortened behat.yml 2012-11-14 00:51:21 +01:00
Ingo Schommer
df23a6ce1a Corrected step wording 2012-11-14 00:51:21 +01:00
Ingo Schommer
9841d5b074 NEW Added Behat tests 2012-11-14 00:51:21 +01:00
Andrew O'Neil
48a9bcf276 APICHANGE: Use late static binding for Object::remove_extension() 2012-11-07 11:08:36 +13:00
Andrew O'Neil
1722f00869 APICHANGE: add_extension() is now called directly on the class, instead of on Object 2012-11-07 11:08:36 +13:00
Ingo Schommer
db3499cdf5 Merge remote-tracking branch 'origin/3.0' 2012-10-16 10:26:09 +02:00
Damian Mooyman
d50cb230e4 BUG Fixed issue with MigrateSiteTreeLinkingTask test data being incorrectly loaded into database
Fixed issue
2012-10-16 16:48:27 +13:00
Simon Welsh
38f28deafe Adds Travis testing to the CMS 2012-09-27 13:00:49 +12:00
Sean Harvey
b92f759963 Fixing test to be less fragile (selects the input ID directly instead of holder) 2012-09-27 12:14:14 +12:00
Sean Harvey
cb8c10a473 Merge branch '3.0' of github.com:silverstripe/silverstripe-cms into 3.0 2012-09-27 10:49:03 +12:00
Sean Harvey
2c4ebd3cb9 Fixing broken SiteTreeHTMLEditorFieldTest 2012-09-23 22:49:44 +12:00
Ingo Schommer
cbd31e3ab2 API Removed SiteTree.MetaTitle and MetaKeywords
They are irrelevant in terms of SEO, general page informancy,
clutter up the CMS UI, and encourage CMS authors to waste
their time filling them out.

[1] http://www.seomoz.org/learn-seo/title-tag
[2] http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/
2012-09-21 11:31:00 +02:00
Ingo Schommer
77ef6570a3 Merge remote-tracking branch 'origin/3.0' 2012-09-21 10:48:22 +02:00
Simon Welsh
4506e92536 Adds Travis testing to the CMS 2012-09-21 15:43:01 +12: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
Ingo Schommer
8a514d8b64 BUG Correct live state in SiteTree->getAbsoluteLiveLink()
Was fetching the record from live (and its direct URLSegment),
but all of its parents from the current stage, which might be draft,
leading to "mixed" draft/live nested URLs which might no longer
be reachable in live mode.
2012-08-28 19:04:16 +02:00
Hamish Friedlander
d45dd34db9 FIX VirtualPageTest failing on apps with no $db on Page
VirtualPageTest was adding fields to Page via a decorator, but Page might
not have any fields itself. This changed Page from not having a table
to having a table, which then caused a problem on tearDown
2012-08-28 15:13:57 +12:00
carlos barberis
f7b6f1de5a BUGFIX: ticket #5239 - Infinite loop: live subpage of draft page redirects onto itself when called just by url segment 2012-07-23 17:06:37 +12:00
Mateusz Uzdowski
54fd54a2fb BUG Change all shortcodes into the new, comma separated, format.
Ref http://open.silverstripe.org/ticket/7337
2012-07-12 17:57:38 +02:00
Ingo Schommer
813ed75869 MINOR Test MenuTitle null'ing (see #7505) 2012-06-20 18:26:55 +02:00
Ingo Schommer
e50936fe9f MINOR Added caching to SiteTree->getStatusFlags(), as its called twice for every node now in LeftAndMain->SiteTreeAsUL() (see #7410) 2012-06-12 19:35:15 +02:00
Sean Harvey
542d727db2 MINOR Don't use deprecated extraStatics when adding extra statics with
DataExtension
2012-05-23 22:13:27 +12: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
8563322971 BUGFIX Fixed publication of multibyte URLSegment in SiteTree->onBeforeWrite(), was wrongly detecting a change and double encoding 2012-05-08 23:45:29 +02:00
Ingo Schommer
08a7bf0879 BUGFIX Remove double URL/filename filtering in FilesystemPublisher to avoid breaking multibyte URLs (now possible through recently introduced URLSegmentFilter class). Multibyte safe url path processing in FilesystemPublisher. 2012-05-08 22:22:08 +02:00
Julian Seidenberg
8ad93a197e BUGFIX: check for abstract classes when automatically registering SS_Report classes. Abstract classes are now no longer included in the list of Reports. Includes unit test for this scenario. 2012-04-20 16:32:39 +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
8a72b32e95 API CHANGE Moved Widget API to new module (https://github.com/silverstripe/silverstripe-widgets), incl. WidgetArea and WidgetAreaEditor classes 2012-04-18 23:21:59 +02:00
Andrew O'Neil
d1c500a5f9 MINOR: Remove checks for PHP <5.3.2, as it's no longer supported 2012-04-18 10:36:55 +12:00
Simon Welsh
b8e86ae261 MINOR Add newline to end of files without one 2012-04-15 10:56:40 +12: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
Ingo Schommer
76f4e6d93b Merge branch 'master' into integration 2012-04-09 21:08:37 +02:00
Normann Lou
c1b248e2cf ENHANCEMENT SiteTree->getStatusFlags() which makes SiteTree->getTreeTitle() extensible 2012-04-04 23:02:53 +02:00
Julian Seidenberg
349a04d049 API-CHANGE: SSF-168 changing the API/code-conventions for excluding specific reports. get_reports method now returns an ArrayList instead of an array of SS_Reports. 2012-04-04 10:58:48 +12:00
Julian Seidenberg
ee220bbcce API-CHANGE: SSF-168 initial rearranging the SS_Report class for use in SS3. Deprecating unnecessary methods, moving code around, rewriting get_reports method and writing unit tests 2012-04-03 18:06:35 +12:00
Julian Seidenberg
fe2805834a ENHANCEMENT: renaming SSReportTest to Report test so it matches the name of Report.php 2012-04-03 16:13:06 +12:00
Sean Harvey
ded3fd8d68 MINOR Fixed broken test from json changes 2012-03-30 16:25:21 +13:00
Ingo Schommer
651441225f Merge pull request #80 from halkyon/e_strict_support
Fixes to method arguments in cms classes for E_STRICT support
2012-03-28 02:48:17 -07:00
Ingo Schommer
1827dc6727 API CHANGE Removed SiteTree->HomepageForDomain and related functionality ($write_homepage_map and generate_homepage_domain_map()), use new 'homepagefordomain' module instead (fixes #6902) 2012-03-27 14:50:09 +02:00
Sean Harvey
0ea9451014 MINOR Fixes to method arguments in cms classes for E_STRICT support. 2012-03-27 21:42:54 +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
f4e3e79c0d API CHANGE Removed ThumbnailStripField class, as it was only used for the CMS image insertion logic (which was rewritten with a more powerful file selection based on GridField) 2012-02-14 13:32:58 +01:00
Fred Condo
d99e3a0927 Code cleanup: removed trailing ?> markers per code standard.
All cms module except lang directory.
2012-02-13 12:48:41 -08: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
Ingo Schommer
a570e2f2a0 API CHANGE Publish ex-VirtualPage records when their page type changes, propagate type change to live (AIR-78) BUGFIX Remove extraneous database rows when changing a page from VirtualPage to another type (AIR-78) 2012-01-14 13:07:48 +01:00
Ingo Schommer
0e4e8034d6 BUGFIX Validate SiteTree::$can_be_root on saving, as well as for VirtualPage originals (AIR-80) 2012-01-14 11:20:54 +01:00
Ingo Schommer
87c318d168 BUGFIX Don't create new version on related VirtualPage records in SiteTree->onAfterWrite() when the write was triggered through writeWithoutVersion(). Use a new $_nextWriteWithoutVersion flag replacing the -1 Version number for this purpose (AIR-97) (see similar commit in sapphire) 2012-01-14 11:11:21 +01:00
Ingo Schommer
0194080951 merge 2011-12-21 17:22:47 +01:00
Ingo Schommer
7a80e6d2ea MINOR Ensuring assets/ folder is created before using it in FileLinkTrackingTest (and using ASSETS_PATH constant instead of hardcoding it) 2011-12-16 17:29:50 +01:00
Ingo Schommer
0b5d20513c ENHANCEMENT Using new URLPathFilter API in SiteTree->generateURLSegment(), allowing customisation of URL filtering and transliteration 2011-11-29 10:45:19 +01:00
Sam Minnee
5addb0054e MINOR: Fixed SearchFormTest to run last, and to recreate the test database so that MyISAM tables are used. 2011-11-08 11:27:25 +13:00
Stig Lindqvist
b5054589e3 MINOR Fixed unittest to use the correct way of setting up Fulltextsearch 2011-10-31 12:20:56 +13:00
Sean Harvey
748c0196cc MINOR Fixed broken CMSPageHistoryControllerTest assuming IDs 2011-10-30 00:19:26 +13:00
Stig Lindqvist
05e90838c0 API CHANGE Switch usage from FieldSet to FieldList 2011-10-27 20:24:45 +02:00
Stig Lindqvist
a3a50b7b6f MINOR Skipping test when PHP Version is lower than 5.3.2
ReflectionMethod#setAccessible was released in PHP Version 5.3.2
2011-10-22 16:17:28 +02:00
Ingo Schommer
f98bc8480c BUGFIX Respect writeWithoutVersion() when updating VirtualPage relationships in SiteTree->onAfterWrite() (AIR-97) 2011-10-07 11:12:52 +02:00
Sam Minnee
5d235fa9f7 ENHACEMENT: Improved caching of permissions for improved CMS perfromance for non-admins (merged from r102278) 2011-10-07 10:36:56 +02:00
Sam Minnee
6fc01394a6 API CHANGE: Added VirtualPage::$non_virtual_fields and VirtualPage::$initially_copied_fields for configuring the behaviour of virtual pages. (merged from r100463) 2011-10-07 10:05:32 +02:00
Ingo Schommer
4903fad537 BUGFIX Checking for SiteTree:: in SiteTree->getClassDropdown() (AIR-20) 2011-10-07 09:29:03 +02:00
Ingo Schommer
2dd96a4050 API CHANGE Checking for SiteTree::$allowed_children in SiteTree->validate() (was only checked via JavaScript before).
BUGFIX Ensure that VirtualPage $allowed_children are checked on original classes to avoid allowing more than necessary (AIR-38)
2011-10-07 08:59:23 +02:00
ajshort
a54963d954 API CHANGE: Replaced DataObjectSet instances with ArrayList. 2011-10-07 08:51:54 +02:00
ajshort
4ecf908e34 MINOR: Replaced containsIDs() calls in tests with assertContains() and column(). 2011-10-07 08:51:54 +02:00
ajshort
daecdcd335 MINOR: Replaced usage of deprecated toDropdownMap() with map(). 2011-10-07 08:51:54 +02:00
Sam Minnee
1821ccbb7d MINOR: Added more explicit test to aid w/ debugging. 2011-10-07 08:51:53 +02:00
Sam Minnee
7a2097dbd0 BUGFIX: Removed obsolete test. 2011-10-07 08:51:53 +02:00
Sam Minnee
d3ca4dac5b BUGFIX: Updated models to suit minor changes in the new ORM. 2011-10-07 08:50:51 +02:00
Will Rossiter
ecae94e8c2 MINOR: added unit test for checking whether viewing an unpublished version directly selects the checkbox option 2011-09-19 17:30:47 +02:00
Will Rossiter
11821f3e43 ENHANCEMENT: implemented further tests for CMSPageHistoryController::getEditForm() 2011-09-19 17:30:47 +02:00
Will Rossiter
18471e8878 ENHANCEMENT: added tests for CMSPageHistoryController::VersionsForm(). BUGFIX: fixed VersionsForm hidden ID storing a reference to itself. ENHANCEMENT: changed url structure from /version/ to /show/ for consistency between CMSPageHistoryController and CMSMain. APICHANGE: moved performRollback() from CMSMain to CMSPageHistoryController 2011-09-19 17:30:47 +02:00
Ingo Schommer
5de2ba5628 MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:42 +02:00
Ingo Schommer
2693f675db ENHANCEMENT Testing new File.ShowInSearch flag, and adding it to AssetTableField view 2011-09-15 15:59:18 +02:00
Ingo Schommer
eecb401952 ENHANCEMENT Removed automatic redirection to admin URLs in ContentController, too counter-intuitive and hard to implement consistently, while still allowing linkage of pages without CMS around them. 2011-08-12 17:06:29 +02:00
Ingo Schommer
e13537e0a7 API CHANGE Refactored SilverStripeNavigator and SilverStripeNavigatorItem to instance-based utility classes, which take a DataObject record in the constructor rather than all of their methods (increasing template flexibility and code isolation).
ENHANCEMENT Added SilverStripeNavigatorItem->canView() for flexible permission control
MINOR Fixed duplicate priority overrides in SilverStripeNavigator
MINOR Removed unnecessary inline styling from SilverStripeNavigator HTML generation
2011-08-12 14:28:17 +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
75ce441348 ENHANCEMENT Redirecting to cms preview in ContentController if user is logged in 2011-07-08 15:36:30 +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
09ad6dcaa6 ENHANCEMENT Showing full CMS search form (instead of toggling fields individually), removing metadata search fields (limiting to fields applicable in new designs)
API CHANGE Renamed CMSMain->SearchTreeForm() to SearchForm(), CMSMain->doSearchTree() to doSearch() (search can be used for list and gallery views as well)
API CHANGE Removed CMSMain->SiteTreeFilterOptions() and CMSMain::$site_tree_filter_options, moved to CMSMain->SearchForm()
2011-04-28 22:49:34 +12:00
Ingo Schommer
7a50608e24 API CHANGE Splitting off "Behaviour" and "Access" tabs from SiteTree->getCMSFields() into SiteTree->getSettingsFields(). Adjusting functionality to split of SiteTree->getCMSFields() into getSettingsFields(), and new tab paths ("Root.Content" instead of "Root.Content.Main") 2011-04-28 22:48:55 +12:00
ajshort
6462c59f0f API CHANGE: Renamed SiteTreeDecorator to SiteTreeExtension.
MINOR: Replaced references to decorators with extensions.
2011-04-15 19:37:15 +10:00
Ingo Schommer
446b8bae63 MINOR Fixed SiteTreeTest->testCompareVersions() to work regardless of used HTMLCleaner implementation (was failing if lib_tidy wasn't available) 2011-04-06 22:16:46 +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
Ingo Schommer
aef17ed2e0 MINOR Fixed SiteTreeTest->testCompareVersions() to work with new Diff/HTMLCleaner implementation 2011-03-30 18:20:38 +13:00
Ingo Schommer
0dfbec8d2d MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer
f1e1cbe09b MINOR Fixed test fixture paths and @package from 'sapphire' to 'cms' 2011-03-28 09:02:43 +13:00
Ingo Schommer
81881e1379 MINOR Added SitetreeHTMLEditorFieldTest to test HtmlEditorField functionality specific to SiteTree and link tracking 2011-03-28 09:02:42 +13:00
Ingo Schommer
dd6a86c1c1 MINOR Moved Widget, WidgetArea and related files from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer
7b038db3be MINOR Moved FileLinkTracking feature into new SiteTreeFileDecorator class in order to move it from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Ingo Schommer
8c04bafb4e MINOR Added class_exists() check for Translatable, which has moved into a new 'translatable' module 2011-03-28 09:02:41 +13:00
Ingo Schommer
6bd9c56100 Moved ContentControllerSearchExtensionTest and SearchFormTest from sapphire/tests/search into "cms" module 2011-03-28 09:02:20 +13:00
Paul Meyrick
dc6ecbd8e8 Minor Moved SiteTreeTest.yml from sapphire/tests to cms module cms/tests 2011-03-28 09:02:20 +13:00
Paul Meyrick
62de2da9e5 Minor Moved MigrateSiteTreeLinkingTask, RemoveOrphanedPagesTask, UpgradeSiteTreePermissionSchemaTask from /sapphire/tasks/ to cms module /cms/tasks/ 2011-03-28 09:02:20 +13:00
Paul Meyrick
5de4f696f3 Minor Moved ErrorPageTest from sapphire/tests/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
69571d5763 Minor Moved VirtualPageTest from sapphire/tests/model/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
d4af221e0a Minor Moved from RedirectorPageTest, SiteTreeActionsTest, SiteTreeBackLinksTest, SiteTreePermissionsTest, SiteTreeTest, WidgetAreaTest /Sites/cgps/sapphire/tests to cms module cms/tests/ 2011-03-28 09:02:19 +13:00
Paul Meyrick
e280929b29 Minor Moved from /sapphire/tests/control/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
d3c5a309bf Minor Moved ErrorPage, RedirectorPage, SiteConfig, SiteTree, SiteTreeDecorator, VirtualPage from sapphire/core/model/ to cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer
9b4f3aaf81 Minor Moved ContentController, ModelAsController, RootURLController, NestedController from sapphire/core/control/ to cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer
fd3ae9100f API CHANGE Replaced LeftAndMain->ajaxupdatesort() and LeftAndMain->ajaxupdateparent() with a combined LeftAndMain->savetreenode() (and a changed request parameter signature) 2011-03-22 18:43:37 +13:00
Ingo Schommer
a220d37e3b Revert "MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10)" - causing too many issues in mixed build environments with other projects requiring PHPUnit 3.4
This reverts commit 7d609f24c9.
2011-03-11 16:10:38 +13:00
Sam Minnee
e45f4c923c MINOR: Misc fixes to clean up the 2.4 mergeback. 2011-02-22 10:52:56 +13:00
Sam Minnee
5a23f69f0b Merge remote branch 'origin/master' 2011-02-22 10:23:08 +13:00
Ingo Schommer
7d609f24c9 MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10) 2011-02-21 18:49:47 +13:00
Sam Minnee
3498e41b0a Merge branch '2.4'
Conflicts:
	_config.php
	code/AssetAdmin.php
	code/AssetTableField.php
	code/CMSBatchAction.php
	code/CMSBatchActionHandler.php
	code/CMSMain.php
	code/CMSSiteTreeFilter.php
	code/CommentAdmin.php
	code/CommentTableField.php
	code/GroupImportForm.php
	code/LeftAndMain.php
	code/MemberImportForm.php
	code/MemberTableField.php
	code/ModelAdmin.php
	code/PermissionRoleAdmin.php
	code/ReportAdmin.php
	code/SecurityAdmin.php
	code/SideReport.php
	code/reports/BrokenLinksReport.php
	code/sitefeatures/MathSpamProtection.php
	code/sitefeatures/PageComment.php
	code/sitefeatures/PageCommentInterface.php
	code/sitefeatures/SSAkismet.php
	css/cms_left.css
	css/cms_right.css
	css/layout.css
	css/silverstripe.tabs.css
	images/loading.gif
	javascript/AssetAdmin.js
	javascript/AssetTableField.js
	javascript/CMSMain_left.js
	javascript/CMSMain_right.js
	javascript/LangSelector.js
	javascript/LeftAndMain.Tree.js
	javascript/LeftAndMain.js
	javascript/LeftAndMain_right.js
	javascript/MemberImportForm.js
	javascript/MemberTableField.js
	javascript/ModelAdmin.js
	javascript/PageCommentInterface.js
	javascript/ReportAdmin_left.js
	javascript/ReportAdmin_right.js
	javascript/SecurityAdmin_right.js
	javascript/SideReports.js
	javascript/SideTabs.js
	javascript/SitetreeAccess.js
	javascript/TranslationTab.js
	javascript/WidgetAreaEditor.js
	javascript/lang/cs_CZ.js
	javascript/lang/en_US.js
	javascript/lang/sk_SK.js
	javascript/tinymce_ssbuttons/editor_plugin_src.js
	javascript/tinymce_ssmacron/editor_plugin_src.js
	lang/en_US.php
	templates/Includes/AssetAdmin_left.ss
	templates/Includes/AssetTableField.ss
	templates/Includes/CMSMain_left.ss
	templates/Includes/CommentTableField.ss
	templates/Includes/ModelAdmin_left.ss
	templates/Includes/SecurityAdmin_left.ss
	templates/PageCommentInterface.ss
	templates/PageCommentInterface_singlecomment.ss
	templates/ReportAdminForm.ss
	tests/CMSMainTest.php
	tests/CMSMainTest.yml
	tests/LeftAndMainTest.php
	tests/MemberTableFieldTest.php
	tests/MemberTableFieldTest.yml
	thirdparty/multifile/multifile.js
2011-02-15 11:50:24 +13:00
Sean Harvey
27aad3deca BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Sean Harvey
77c5701fa6 BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!) (from r114940)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
bc3df654bd API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Sean Harvey
602fcaa7b5 MINOR Use Filesystem::removeFolder() in FilesystemPublisherTest::tearDown() instead of specific code to handle this
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Sean Harvey
9cd40767f6 MINOR #6090 FilesystemPublisherTest now stores temporary files in assets, which is writable, instead of the webroot which almost never has write permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Ingo Schommer
f969eeedc3 MINOR Removing MemberImportFormTest, breaks PHPUnit test run, and doesnt have any assertions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111053 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Ingo Schommer
a010ab82a3 MINOR Made CMSMainTest more resilient against database ID changes (Postgres doesn't have auto-increment resets across tests at the moment)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106248 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Sam Minnee
faa17fd2ce MINOR: Fixed test that required a separate Page table.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106090 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Sam Minnee
9bf0b7a6ba MINOR: Added test for #5657
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Ingo Schommer
97c1ff1e18 ENHANCEMENT Added PageComment->canView()/canEdit()/canDelete(), and using these permissions in PageCommentInterface. Caution: canCreate() actions are still determined by PageCommentInterface::$comments_require_login/$comments_require_permission
BUGFIX Requiring CMS_ACCESS_CommentAdmin instead of ADMIN permissions in PageCommentInterface and CommentAdmin administrative actions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104968 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Luke Hudson
cbc0b0a849 MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +13:00
Luke Hudson
0aba4e6bc1 MINOR: Add README.md describing salad tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104077 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +13:00
Ingo Schommer
5a7a0128f3 MINOR Fixed CMSMainTest for postgres by not hardcoding fixture IDs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:31 +13:00
Ingo Schommer
c56a6090ce MINOR Unsetting state in FilesystemPublisherTest (regression from r103745)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103763 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:31 +13:00
Saophalkun Ponlu
9c4c3eef2e BUGFIX: static publisher for a site that resides in a subfolder of webroot
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:31 +13:00
Luke Hudson
b19047a299 ENHNANCEMENT: Move cuke/ to salad/
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103375 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Geoff Munn
597b9cd2f0 BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Mateusz Uzdowski
9e0c8dd384 BUGFIX: the decorator was not completely removed, which caused trouble for tests running later in the same batch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103214 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Luke Hudson
30e6e91a81 BUGFIX: Fix Salad tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Luke Hudson
5ba4e2d09c ENHANCEMENT: Updated automatic regression tests (Salad)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Luke Hudson
1d50542d6f MINOR: Make Salad accept "login" or "log in"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Luke Hudson
a32b6237ed BUGFIX: Update Salad tests to match behaviour
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Sam Minnee
e3dd9c9af3 MINOR: Fixed test that was relying on bug fixed in r101116
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101132 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Sam Minnee
9ac87ea4fc MINOR: Fixed test that was relying on bug fixed in r101116
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Geoff Munn
16f4e99af9 BUG FIX: column names quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100699 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Geoff Munn
c3006cc448 BUG FIX: column name capitalised
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Sam Minnee
6b1f258c44 BUGFIX #5073: Fixed CMS version indicator for alpha and beta versions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Ingo Schommer
033d27ac3f MINOR Moved ul.tree rules from cms/css/cms_left.css to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox styling) (see r98854) (merged from r98855) (from r98865)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Carlos Barberis
9624757e14 ENHANCEMENT: added new PageCommnet to yml so we have different amounts of moderated/unmodereated
BUGFIX: really testing deletemarked now.


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99679 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:59 +13:00
Ingo Schommer
0a137a4840 ENHANCEMENT Making setting optional in MemberTableField. Field instances without will list all members unfiltered, and remove members from the database rather than the group relation.
ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField through setPermissions(array('inlineadd')) (from r98825)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:58 +13:00
Ingo Schommer
dbec9a4c8a MINOR Fixed SapphireTest->logInWithPermission() spelling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Ingo Schommer
641a8fec7a MINOR Fixed FilesystemPublisherTest to have self-contained extension settings, and not rely on static publishing being enable in mysite/_config.php already. Fixed login permissions for doPublish() calls in test case.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99347 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:55 +13:00
Ingo Schommer
a7ede59221 MINOR refactored setting/getting strict hierarchy setting. (from r98654)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99126 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
340230b9c9 MINOR more unit tests around loose hierarchy (from r98509)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99121 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:51 +13:00
Carlos Barberis
554ea629dc ENHANCEMENT: added PageComment for CommentAdminTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99069 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:45 +13:00
Carlos Barberis
a0c8e9e1eb ENHANCEMENT: CommentAdmin unitest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99066 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:45 +13:00
Tom Rix
f72fb26b4c BUGFIX fix for #5076
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:44 +13:00
Ingo Schommer
a9d6dec5ec FEATURE Import members and their group assignments from CSV in admin/security through the new MemberImportForm class (merged from r98708)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:42 +13:00
Sam Minnee
983849449e API CHANGE: Introduced new API for SS_Report
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98215 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
602e5ae671 MINOR: Fixed side report tests to suit new report system. (from r96646)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
4982aac955 MINOR remove sort direction when running canSortBy. Also added test coverage for this. (from r96428)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Frank Winkelmann
48a7c1ee87 BUGFIX: Ticket #4805
added a canCreateTopLevel() if there is no parent object in CMSMain.php 
added testCreationOfTopLevelPage toCMSMainTest.php
added the nessessary 'database entries' in the CMSMainTest.yml 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Will Rossiter
463053136d BUGFIX: Comment URL field check is now case insenstive. Included tests for various protocols. PATCH via simon_w. Ticket #4776
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97016 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Sam Minnee
4f07a30a6b MINOR: Fixed CMSMainTest to be more flexible about modules altering the buttons.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
4567f66a0a MINOR: Updated ModelAdminTest to use extraDataObjects (from r90055)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:15 +13:00
Sam Minnee
27f3dfc6ed BUGFIX: Fixed viewing of deleted pages. (from r89833)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:13 +13:00
Sam Minnee
b7181a832f MINOR: Make CMSMainTest compatible with cmsworkflow module. (from r89030)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96794 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:13 +13:00
Sam Minnee
460fe2e5ab MINOR: fix javscript syntax that can confuse ie (from r86395)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Mateusz Uzdowski
b89cb9b018 BUGFIX: fixing CMS_ACCESS_LeftAndMain permission (=access all cms sections). Also added the test.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +13:00
Will Rossiter
19670e7b27 FEATURE: added delete all link to page comments. Patch via #4427. Thanks walec51
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95418 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +13:00
Sam Minnee
56a4bf0129 MINOR: Fixed a few glitches in the cuke tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94531 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:07 +13:00
Sam Minnee
419da4d67c MINOR: Added a first cut of some cucumber tests for the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94529 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:07 +13:00
Ingo Schommer
b261d3cadc ENHANCEMENT Allowing to hide certain permission from showing in SecurityAdmin? through add_hidden_permission() (refactored from r92428) (from r92866)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Normann Lou
73681b0afa APICHANGE: add the ability to remove some permissions specified by their code in the rendered field html of PermissionChecksetBoxField and full-covered unit tests of this ability.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@92428 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Sean Harvey
5bdfad6ae8 MINOR Fixed broken CMSMainSearchFormTest::testTitleFilter() when more fixtures are added that start with "Page 1", e.g. "Page 10"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114950 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-14 01:46:58 +00:00
Sean Harvey
22ac12c0c5 BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-14 01:29:38 +00:00
Ingo Schommer
8f4b816c1f MINOR Removed CommentAdmin from assertions in LeftAndMainTest (functionality moved into module)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114881 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-13 05:09:41 +00:00
Will Rossiter
6d0c79c839 APICHANGE: removed page comments from core. Please see the github.com account for page comments functionality
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 05:43:08 +00:00
Geoff Munn
390eaf93b7 MINOR: hard-coded IDs replaced
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@113677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-11 22:26:39 +00:00
Sam Minnee
3894004ff8 MINOR Use Filesystem::removeFolder() in FilesystemPublisherTest::tearDown() instead of specific code to handle this (from r111899)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:34 +00:00
Sam Minnee
a91726e0aa MINOR #6090 FilesystemPublisherTest now stores temporary files in assets, which is writable, instead of the webroot which almost never has write permissions (from r111883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:29 +00:00
Sam Minnee
6fb50a583a MINOR Removing MemberImportFormTest, breaks PHPUnit test run, and doesnt have any assertions (from r111053)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:02:54 +00:00
Ingo Schommer
66f2fad70a MINOR Made CMSMainTest more resilient against database ID changes (Postgres doesn't have auto-increment resets across tests at the moment) (from r106248)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112578 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:31:30 +00:00
Ingo Schommer
88b2fbb90c MINOR: Fixed test that required a separate Page table. (from r106090)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:35:52 +00:00
Ingo Schommer
376e7bf3b0 MINOR: Added test for #5657 (from r106081)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:35:17 +00:00
Ingo Schommer
e43a2409cd ENHANCEMENT Added PageComment->canView()/canEdit()/canDelete(), and using these permissions in PageCommentInterface. Caution: canCreate() actions are still determined by PageCommentInterface::$comments_require_login/$comments_require_permission
BUGFIX Requiring CMS_ACCESS_CommentAdmin instead of ADMIN permissions in PageCommentInterface and CommentAdmin administrative actions (from r104968)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112459 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:45:05 +00:00
Ingo Schommer
e9b8594fe9 MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests (from r104078)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112451 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:33:10 +00:00
Ingo Schommer
3b279b30a0 MINOR: Add README.md describing salad tests (from r104077)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112450 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:32:04 +00:00
Sam Minnee
88d6823d34 MINOR Fixed CMSMainTest for postgres by not hardcoding fixture IDs (from r103818)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:20:38 +00:00
Sam Minnee
e40661c160 MINOR Unsetting state in FilesystemPublisherTest (regression from r103745) (from r103763)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:20:33 +00:00
Sam Minnee
fa4415459a BUGFIX: static publisher for a site that resides in a subfolder of webroot (from r103745)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:20:27 +00:00
Sam Minnee
b0b542d500 MINOR Fixed SapphireTest->logInWithPermission() spelling (from r99492)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112076 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:06:29 +00:00
Sam Minnee
66be7c939b ENHNANCEMENT: Move cuke/ to salad/ (from r103375)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:15:05 +00:00
Sam Minnee
cdfbc8a604 BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme. (from r103255)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:14:49 +00:00
Sam Minnee
88db7a6a50 BUGFIX: the decorator was not completely removed, which caused trouble for tests running later in the same batch (from r103214)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111660 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:14:42 +00:00
Sam Minnee
186f59b059 BUGFIX: Fix Salad tests (from r102265)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111652 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:12:29 +00:00
Sam Minnee
e33bfb2755 ENHANCEMENT: Updated automatic regression tests (Salad) (from r101871)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111649 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:11:04 +00:00
Sam Minnee
7316586899 MINOR: Make Salad accept "login" or "log in" (from r101870)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111648 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:10:59 +00:00
Sam Minnee
99b0fe04f3 BUGFIX: Update Salad tests to match behaviour (from r101869)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111647 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:10:48 +00:00
Sam Minnee
6b9544b22f MINOR: Fixed test that was relying on bug fixed in r101116 (from r101132)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111639 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:07:16 +00:00
Sam Minnee
000308fca1 MINOR: Fixed test that was relying on bug fixed in r101116 (from r101117)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:07:10 +00:00
Sam Minnee
c12ebeb9fe BUG FIX: column names quoted properly (from r100699)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111630 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:27 +00:00
Sam Minnee
aa81a40b6e BUG FIX: column name capitalised (from r100689)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111629 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:22 +00:00
Sam Minnee
325a57eea6 BUGFIX #5073: Fixed CMS version indicator for alpha and beta versions. (from r99789)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:46:01 +00:00
Sam Minnee
4a613c0e02 ENHANCEMENT: added new PageCommnet to yml so we have different amounts of moderated/unmodereated
BUGFIX: really testing deletemarked now. (from r99679)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:42:32 +00:00
Sam Minnee
11fac7c0c6 MINOR refactored setting/getting strict hierarchy setting. (from r98654) (from r99126)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111607 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:29:48 +00:00
Sam Minnee
2d02afc3f4 MINOR more unit tests around loose hierarchy (from r98509) (from r99121)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111605 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:27:20 +00:00
Ingo Schommer
802ad59f2a MINOR Fixed FilesystemPublisherTest to have self-contained extension settings, and not rely on static publishing being enable in mysite/_config.php already. Fixed login permissions for doPublish() calls in test case. (from r99347)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:11:45 +00:00
Ingo Schommer
42f237bb8f ENHANCEMENT: added PageComment for CommentAdminTest (from r99069)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106140 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:43:20 +00:00
Ingo Schommer
c850ba9aca ENHANCEMENT: CommentAdmin unitest (from r99066)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:36:49 +00:00
Ingo Schommer
ae6e0cfdf4 BUGFIX fix for #5076 (from r98957)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:29:14 +00:00
Ingo Schommer
0cecb21f50 API CHANGE: Introduced new API for SS_Report (from r98215)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-28 02:34:37 +00:00
Ingo Schommer
2451fdbee9 MINOR: Fixed side report tests to suit new report system. (from r96646) (from r98198)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-28 02:30:46 +00:00
Ingo Schommer
b5e3c6acc2 MINOR remove sort direction when running canSortBy. Also added test coverage for this. (from r96428) (from r98192)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-28 02:30:10 +00:00
Ingo Schommer
24fb77ab73 MINOR Fixed typo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@103669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-28 07:16:31 +00:00
Ingo Schommer
6ea662cd05 MINOR Changed CMSMainTest to use new LeftAndMain->doAdd() controller actions, not the removed addform()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102787 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:07:25 +00:00
Ingo Schommer
fe543edcd6 BUGFIX: Ticket #4805
added a canCreateTopLevel() if there is no parent object in CMSMain.php 
added testCreationOfTopLevelPage toCMSMainTest.php
added the nessessary 'database entries' in the CMSMainTest.yml (from r98001)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102749 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 01:36:42 +00:00
Ingo Schommer
0b6f99df14 BUGFIX: Comment URL field check is now case insenstive. Included tests for various protocols. PATCH via simon_w. Ticket #4776 (from r97016)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102706 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 06:59:20 +00:00
Ingo Schommer
c9df94a7af MINOR: Fixed CMSMainTest to be more flexible about modules altering the buttons. (from r96827)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 06:57:30 +00:00
Ingo Schommer
fc71d16100 MINOR: Updated ModelAdminTest to use extraDataObjects (from r90055) (from r96803)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102666 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:27:47 +00:00
Ingo Schommer
d81cae7dfd BUGFIX: Fixed viewing of deleted pages. (from r89833) (from r96795)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102486 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 10:08:00 +00:00
Ingo Schommer
444e192068 MINOR: Make CMSMainTest compatible with cmsworkflow module. (from r89030) (from r96794)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 10:04:49 +00:00
Ingo Schommer
671bff2828 MINOR: fix javscript syntax that can confuse ie (from r86395) (from r96776)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102472 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 08:56:08 +00:00
Ingo Schommer
49cff72b8f BUGFIX: fixing CMS_ACCESS_LeftAndMain permission (=access all cms sections). Also added the test. (from r95788)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 08:44:29 +00:00
Ingo Schommer
1ba1c563a8 ENHANCEMENT Making setting optional in MemberTableField. Field instances without will list all members unfiltered, and remove members from the database rather than the group relation.
ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField through setPermissions(array('inlineadd'))

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98825 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-11 21:55:33 +00:00
Ingo Schommer
89c926221f FEATURE Import members and their group assignments from CSV in admin/security through the new MemberImportForm class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98708 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-10 23:06:31 +00:00
Sean Harvey
0670933202 FEATURE: added delete all link to page comments. Patch via #4427. Thanks walec51 (from r95418)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95658 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 06:08:03 +00:00
Sean Harvey
477dea3161 MINOR: Fixed a few glitches in the cuke tests (from r94531)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95649 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:59:05 +00:00
Sean Harvey
eab27b46a8 MINOR: Added a first cut of some cucumber tests for the CMS (from r94529)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95648 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:58:50 +00:00
Ingo Schommer
a5070b858a API CHANGE Removed CMSSiteTreeFilter->showInList(), using custom logic in CMSMain->SearchTreeForm() instead
API CHANGE Returning arrays instead of Query resource from CMSSiteTreeFilter->pagesIncluded()
MINOR Removed unused LeftAndMain->getMarkingFilter() and CMSMainMarkingFilter, now handled by CMSSiteTreeFilter and CMSMain->SearchTreeForm()
ENHANCEMENT Moved 'page tree filter' dropdown logic into an additional option for CMSMain->SearchTreeForm() (originally implemented in r83674)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92938 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-22 08:23:12 +00:00
Ingo Schommer
7a1e3a9bda ENHANCEMENT Allowing to hide certain permission from showing in SecurityAdmin through add_hidden_permission() (refactored from r92428)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92866 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 05:24:43 +00:00