Commit Graph

39 Commits

Author SHA1 Message Date
Sam Minnee bbc3aaaf9f MINOR: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
Loz Calver b624eb98f1 FIX: Setting target for unwritten VirtualPage breaks write
The VirtualPage inherits the ID of the target page, which is undesirable if the VirtualPage hasn’t been written yet - it will trick write() into thinking that the record already exists in the database
2015-11-18 09:14:16 +00:00
Loz Calver 2983d823d1 FIX: Ensure VirtualPage forwards request/response data to virtual controllers (fixes #1329) 2015-11-18 09:14:11 +00:00
Damian Mooyman f3e1472493 API Revert DataObject::validate to 3.1 method signature (protected) 2015-06-16 11:44:19 +12:00
Stan Hutcheon e2d85b2f88 VirtualPage call init on target controller 2015-06-13 12:38:59 +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 9d7a640205 Merge remote-tracking branch 'origin/3.1' into 3 2015-03-11 11:43:56 +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
Damian Mooyman 21e2bc7258 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	code/reports/Report.php
2015-02-20 10:16:37 +13:00
Michael Strong 7733c4335e BUG Correctly sanitise Title 2015-01-22 17:54:05 +13:00
Loz Calver a142ffd465 FIX: VirtualPages use correct casting for 'virtual' database fields 2014-11-17 15:44:17 +00: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
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
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
Gus King 7b4cc316ef Numerous PHPDoc fixes. 2014-02-10 15:35:13 -05:00
Ingo Schommer 878cf541b9 Better UI feedback on VirtualPage states (fixes #1594) 2013-04-16 11:56:33 +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
Ingo Schommer df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Andrew Short a6cee248e0 BUGFIX: Consistently style custom defined page icons.
* Renamed generateTreeStylingCSS() to generatePageIconsCSS().
* Removed legacy icon definitions.
2012-06-13 17:46:43 +10:00
Sean Harvey 7ed09917ac BUGFIX Fixing incorrect URL to edit canonical page on VirtualPage 2012-05-22 17:44:01 +12:00
Ingo Schommer 38f1236b1f MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:05:19 +02:00
Robert Curry db3332e629 MINOR: Modify VirtualPage to work with lazy loading. 2012-05-01 09:38:20 +12:00
Ingo Schommer 0f7dd7922f API CHANGE Removed $controller context from SiteTree->CMSTreeClasses(), now handled through closures in the specific LeftAndMain usage instead (to handle separate contexts for links and determining "current page") 2012-04-17 22:59:11 +02:00
Ingo Schommer 52e69dd1fd MINOR Removed usage of deprecated $priority argument for _t() 2012-04-15 16:49:31 +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
Fred Condo 10c171f1bb ENHANCEMENT #6828 (Trac): Add a canonical link tag to the meta tags of Virtual Pages
See http://support.google.com/webmasters/bin/answer.py?hl=en&answer=139394
2012-03-02 10:59:15 -08: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 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 9101a75123 MINOR Code formatting and docs in VirtualPage (no functional changes) 2012-01-14 11:24:40 +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 062e3b6a0c MINOR Provide addition tree hints for VirtualPage original page type (AIR-81) 2012-01-14 11:13:17 +01:00
phalkunz ac79934077 ENHANCEMENT Render page tree icons as stylesheets rather than $_TREE_ICONS JS definitions. Removed file/folder swapping of SiteTree::$icon, use relative file path including extension instead. 2011-12-19 14:03:42 +01:00
Will Rossiter e17b4a185a MINOR: update PageTypes to use updated tab path for CMS fields. Fixes #6811 2011-12-17 16:46:26 +13:00
Ingo Schommer 21d10ad32f BUGFIX Consistently returning a record from VirtualPage->CopyContentFrom(), even if pointing to a non-existant ID (AIR-77) 2011-10-07 11:09:10 +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 5de2ba5628 MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:42 +02:00
Ingo Schommer e2f4dd0b44 ENHANCEMENT Added SiteTree::$description to provide more context for content authors selecting a new page type 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
Ingo Schommer 60abe5fb9f MINOR Moved files into a more logical structure in cms/code 2011-03-30 20:03:44 +13:00