Commit Graph

282 Commits

Author SHA1 Message Date
Damian Mooyman
89fbae2c2e BUG Fix encoding of SiteTree.MetaTags 2014-04-29 08:54:17 +12:00
Loz Calver
396fd9a86e FIX: Broken file link tracking (fixes #996) 2014-04-28 09:26:34 +01:00
Damian Mooyman
61ebe08437 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:10:49 +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
Stephen Shkardoon
8e50405871 FIX Prevent SQLi when no URL filters are applied 2014-03-19 19:05:13 +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
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
889e97e17d Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:06:56 +13:00
Hamish Friedlander
224033e518 FIX Limit ExtraMeta to only allow meta and link elements 2014-02-17 12:08:09 +13:00
Sean Harvey
0bb5b4c8a4 Merge branch '3.1' 2014-02-12 11:13:29 +13:00
Gus King
7b4cc316ef Numerous PHPDoc fixes. 2014-02-10 15:35:13 -05:00
Gus King
457cadb103 Documented magic properties/methods of SiteTree and SiteConfig. 2014-02-09 19:13:04 -05:00
Russell Michell
7d7c75414c NEW Track broken anchors 2014-01-31 12:44:59 +13: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
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
Ingo Schommer
aae6b2b296 Avoid encoded HTML breadcrumbs 2013-10-11 00:27:21 +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
e170f4c21b FIX Escaping in "dependent pages" (SS-2013-009) 2013-09-24 21:37:26 +02:00
Ingo Schommer
29e502a63a Hints for SiteTree.TreeTitle casting
Relates to SS-2013-009
2013-09-24 21:37:26 +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
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
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
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
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
g4b0
238f2908e5 BUG: fixed "regression" inserted with 9281ebc647 adding a new class to SiteTree elem (edit-disabled) 2013-06-03 13:46:10 +02:00
Sean Harvey
20f044cef0 BUG Fixing regression from silverstripe/sapphire/67d1327
Status flag classes didn't pick up styling because the flag was
changed to prefix "status-".
2013-05-26 12:31:15 +12:00
Russell Michell
9281ebc647 BUGFIX: Content authors with SiteTree#canView() but not SiteTree#canEdit() were unable to click on SiteTree items in the CMS.
- The 'disabled' attribute in <li> will now only render if the author _really_ can't do _anything_
2013-05-23 14:48:24 +12:00
Ingo Schommer
b2e9353755 Merge pull request #701 from tractorcow/3.1-api-updaterelativelink
API Added SiteTreeExtension::updateRelativeLink
2013-05-17 05:05:03 -07:00
Mateusz Uzdowski
bccd2f8e51 API Add a missing alternatePreviewLink hook for SiteTree extensions. 2013-05-17 15:00:08 +12:00
Sean Harvey
a681b8e4ab BUG Don't redirect to ErrorPage in CMS with x-cms-edit-link 2013-05-14 00:06:09 +12:00
Simon Welsh
be25c302ac FIX Escape the sitetree_link shortcode return value 2013-05-10 14:05:06 +12:00
Damian Mooyman
61312a5d7f API Added SiteTreeExtension::updateRelativeLink
Updated SiteTreeExtension PHPDoc
Refactored out Translatable extension in RelativeLink
2013-05-10 12:22:22 +12:00
Sean Harvey
b4f2e35b32 Updating text for permission description to be accurate for 3.x 2013-04-30 17:58:47 +12:00
Ingo Schommer
878cf541b9 Better UI feedback on VirtualPage states (fixes #1594) 2013-04-16 11:56:33 +02:00
Ingo Schommer
da515b8f65 FIX Use SSViewer.theme_enabled in CMS logic 2013-04-08 19:29:09 +12:00
Ingo Schommer
18201c05af Fixed Config usage in ErrorPage 2013-03-27 12:00:55 +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
Daniel Hensby
e131a041d4 BUG Metadata heading removed from RediretorPage
Currently the empty metadata accordion stays on the RedirectorPage. This is now removed.
2013-02-20 13:32:55 +00:00
Ingo Schommer
a0e965b7b4 Revert "FIX: updateCMSFields not accepting var by reference"
This reverts commit e56a78b160.
2013-02-06 18:59:51 +01:00
Ingo Schommer
23eeb99075 FIX Clear Requirements before in-memory HTTP request for ErrorPage
For example, avoids issues where separate controllers (calling and called) operate on the same
set of files through Requirements::combine_files().
2013-02-06 10:43:42 +01:00
Ingo Schommer
b19a82b693 SiteTree on*() callbacks now consistently invoke on subclasses as well
Before this was only possible for some specific ones, like onBeforeWrite.
This excludes any callbacks with augment*() or update*() naming,
since these are assumed to be on extension only, with a corresponding
base method available on the class itself (e.g. "updateCMSFields()"
vs "getCMSFields()").
2013-02-06 10:43:31 +01:00
Michael Andrewartha
e56a78b160 FIX: updateCMSFields not accepting var by reference
updateCMSFields should be taking the fields var by reference.
@see https://github.com/silverstripe/sapphire/pull/1156
2013-02-04 12:55:29 +00:00
Ingo Schommer
00097a5d5d NEW Clickable URL preview in CMS
- Refactored SiteTreeURLSegmentField to render controls in template
rather than JS for better clientside performance, and cleaner behaviour.
- Added dynamic ellipsis to start of URL, to retain most relevant
part of the URL (the last bits)
- Added "suffix" setting to field, which defaults to ?stage=Stage
- Removed prefix from edit view to leave more room for URL

Thanks to @sunnysideup for getting this started in
https://github.com/silverstripe/silverstripe-cms/pull/269
2013-02-04 12:12:28 +01:00
Ingo Schommer
931b726589 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 13:09:14 +01:00
Ingo Schommer
b25063b09c Extracted ErrorPage default data to getter
Allows for less verbose overloading, while still keeping i18n capabilities
in place, which isn't possible with DataObject::$default_records
2013-01-30 13:07:11 +01:00
Ingo Schommer
416178b668 Reduced code duplication in ErrorPage (no functional changes) 2013-01-29 19:34:05 +01:00
Kirk Mayo
81cd0e6e04 BUG: Replaced extendedSQL with DataList as per ticket 8183 2013-01-24 08:45:30 +13:00
Ingo Schommer
61f2ab7519 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-21 10:03:30 +01:00
unclecheese
cfc976bff8 MINOR: Grammar error 2013-01-17 14:31:35 -05:00
Ingo Schommer
76aeec70e7 NEW SiteTree->PreviewLink() for fine grained URL control 2013-01-14 17:12:23 +01:00
Normann Lou
f674af0c73 BUG: dependentPages grid field not showing necessary columns and their values. 2013-01-09 22:35:54 +01:00
Ingo Schommer
cc536f644e Fixed "last edited" display in CMS actions 2012-12-17 12:31:28 +01:00
Ingo Schommer
5b2cc19704 Added placeholder text to group listboxes 2012-12-15 19:57:14 +01:00
Ingo Schommer
74d63791b7 Fixed regression in SiteTree->getCMSActions()
Caused by toolbar recent changes
2012-12-14 01:21:54 +01:00
Mateusz Uzdowski
26cc14a930 API Rework the CMS actions to use alternating buttons and drop-ups.
Utilise the new features provided by the framework to get richer
interface:
* save buttons that highlight the current state of the page
* minor actions in a drop-up
* embed last publishing and saving information
2012-12-13 19:10:39 +01:00
Ingo Schommer
1bf67fd942 Merge remote-tracking branch 'origin/3.0' 2012-12-10 18:09:34 +01:00
Mateusz Uzdowski
c0751df54e BUG Remove handwritten SQL and use the ORM.
The custom SQL does not take subsites into account and breaks the CMS
on certain pages - under some circumstances the custom count will return
1 or more, while the set will be in fact empty because of augmentation.
2012-12-05 10:27:12 +13:00
Ingo Schommer
e6e12fe00e Merge branch '3.0'
Conflicts:
	composer.json
2012-11-22 23:48:18 +01:00
Tim Klein
59719a46cc MINOR removed reference to non existent js
cms/javascript/SitetreeAccess.js is no longer with us :)
2012-11-19 16:15:57 +13:00
Sean Harvey
cef087f689 Removed deprecated SiteTree::TreeTitle(), use getTreeTitle() instead 2012-11-15 14:41:17 +13:00
Sean Harvey
d236bb58eb Removed deprecated SiteTree::prepopuplate_permission_cache()
This function is misspelled, and was marked deprecated. This commit
removes that function. Please use prepopulate_permission_cache()
instead (note the removal of the extraneous "p" in "prepopuplate")
2012-11-15 14:39:48 +13:00
Sean Harvey
555ecd7f24 Removed deprecated SiteTreeDecorator, use SiteTreeExtension instead 2012-11-15 14:31:54 +13:00
Simon Welsh
d006c08db3 Reverts test code committed in a52514a3 2012-11-10 15:42:45 +13:00
Ingo Schommer
a52514a306 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:24:01 +01:00
Sam Minnee
ef32310ef8 FIX: Allow 1024 chars for keywords, not a mere 255 2012-11-05 17:58:32 +13:00
Will Rossiter
b221f7ba7a FIX Remove Metadata Label from RedirectorPage. (Fixes #7959) 2012-10-23 19:32:25 +13:00
Ingo Schommer
17113039be NEW Enable SiteTree::$nested_urls by default 2012-10-08 17:05:46 +02:00
Ingo Schommer
0d03c62984 Merge remote-tracking branch 'origin/3.0' 2012-10-03 16:16:25 +02:00
Ingo Schommer
a6d09988ed Merge pull request #214 from silverstripe-droptables/ssexpress
Tweaks to CMS required for Translatable
2012-10-02 02:10:47 -07:00
Robert Curry
9cf5a6f47a BUG: Remove the is_null check on augmentValidURLSegment
Object::extend already does a check for NULL before it adds the results
to the array of return values. This was required for Translatable as the
result from Translatable::augmentValidURLSegment was being ignored.
2012-10-02 11:29:10 +13: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
345dbc8a4f BUG Fixing broken links "admin/show", should be "admin/pages..." 2012-09-25 15:31:42 +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
cebce51bc1 Merge branch 'open/7875' of git://github.com/jbridson/silverstripe-cms into jbridson-open/7875 2012-09-21 10:49:20 +02:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Jeremy Bridson
05d5bd7508 ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen. 2012-09-20 13:22:12 +12:00
Damian Mooyman
02e95adb4c BUG Consistently save SiteConfig, and refactor Translatable hooks
Squashed commit of the following:

commit a60eddfacc710d3047bd1d5107e5df0cc6dba93c
Merge: c847b55 76be14b
Author: Ingo Schommer <ingo@silverstripe.com>
Date:   Fri Sep 7 17:02:47 2012 +0200

    Merge branch '3.0-translation-migration' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-migration

commit 76be14b1fc
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:28:18 2012 +1200

    FIXED: Indentation

commit 715b60387c
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:25:14 2012 +1200

    FIXED: Coding style inconsistencies

commit 6395f9030e
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Thu Aug 16 16:30:11 2012 +1200

    FIXED: Issue where new SiteConfig instances weren't always saved to the database

commit aca242e31c
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Thu Aug 16 14:22:56 2012 +1200

    UPDATED: Refactored Translation module specific code out of the SiteConfig
2012-09-07 17:06:29 +02:00
Hamish Friedlander
af2c890168 Merge pull request #190 from silverstripe-rebelalliance/open/5971
NEW Add warning if viewed SiteTree object class is obsolete
2012-09-02 14:12:23 -07: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
Hamish Friedlander
949507c3fe NEW Add warning if viewed SiteTree object class is obsolete 2012-08-29 14:48:23 +12: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
Ingo Schommer
59546ccf11 Localized page name in "add page" dialog and dropdowns (see #7798) 2012-08-26 23:58:38 +02:00
Ingo Schommer
2e791abad2 Better i18n for "new page" label (fixes #7796)
Also using better standard name for auto generated
page names ("Page" instead of "Site Tree",  "Pages" instead of "Site Tres" [sic])
2012-08-20 22:25:18 +02:00
Sean Harvey
c019f22163 Fix notice when ErrorPage tries to create static error pages and can't write 2012-08-20 15:23:46 +12:00
Ruud Arentsen
18a40b4b5d BUG Adding siteconfig translations
translations were not added in the same translation group, and the
translation module didn't work. Also commited changes in the translation module, which will need this commit.
2012-08-10 10:16:39 +02:00
Ingo Schommer
39a9093715 BUG SiteTree->provideI18nEntities() limited to class
Called for each subclass by the collector,
so we don't need to aggregate here.
In fact, its harmful because it causes entities
to be placed in the wrong definitions file.
The <class>.DESCRIPTION entity was always placed in cms/lang/en.yml,
regardless of the original location of the file containing the class.
2012-08-06 14:28:04 +02:00
Ingo Schommer
671c7daa4c SiteConfig load/save with ID in CMS
Allow loading a SiteConfig by ID (by specifying $tree_class),
and pass the ID through with the form data. Unifies processing
with SiteTree, and allows the Translatable module
to use the same logic for interacting with the load/save process.
2012-08-06 09:36:25 +02:00
Ingo Schommer
9076286162 SiteTree->CMSEditLink()
Mainly to make it compatible with the Translatable
extension linking to existing translations of it,
but also to make it work similarly to the SiteTree logic elsewhere.
2012-08-05 20:52:22 +02:00
Kirk Mayo
b15fabaf0d BUG: open ticket 5880 always show the current page type in the page type dropdown list 2012-07-16 14:56:24 +12:00
Ingo Schommer
69e4fa072a Toggle metadata fields in SiteTree->getCMSFields()
To save space, reduce clutter and deemphasize the fields.
Partially fixes #7405, needs better design though.
2012-07-15 21:29:46 +02: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
d1bc7219a8 Merge branch '3.0' 2012-07-05 17:53:35 +02:00
Sam Minnee
040f780a15 BUG: Allow children on RedirectorPage (Trac #7587) 2012-06-29 16:24:20 +12:00
Ingo Schommer
bb5e3e5fbd MINOR Remove DB dependency from SiteTree->provideEntities()
Use class manifest instead, which provides same level of info,
and means we can run the text collector on bare checkouts
without a database set.
2012-06-25 14:01:19 +02:00
Will Rossiter
facc8ba653 MINOR: restore backlinkcount into cms module. (removed from framework in 266a61221c) 2012-06-20 16:27:47 +02:00
Will Rossiter
3b7af0e945 MINOR: restore backlinkcount into cms module. (removed from framework in 266a61221c) 2012-06-20 16:20:04 +02:00