Commit Graph

2112 Commits

Author SHA1 Message Date
Ingo Schommer
8a96bab70d Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 18:50:52 +02:00
Ingo Schommer
9a4a5d909d Merge pull request #816 from kinglozzer/798-custom-page-icons
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798)
2013-09-25 12:54:01 -07:00
Ingo Schommer
86339a551d Clearer escaping in CMSMain
No direct security issue, but makes intent clearer
2013-09-24 21:37:26 +02:00
Ingo Schommer
e170f4c21b FIX Escaping in "dependent pages" (SS-2013-009) 2013-09-24 21:37:26 +02:00
Ingo Schommer
79996a76fe Clearer escaping in ReportAdmin
No direct security issue since report titles can't be set by the user
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
Ingo Schommer
201f4881e6 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-12 17:16:29 +02:00
Ingo Schommer
4e031076be Search callback for "add page" selector
Necessary since we now default $showSearch=true in TreeDropdownField.
See https://github.com/silverstripe/silverstripe-framework/pull/2364
2013-08-29 17:08:42 +02:00
Tom Densham
4f30fedafd FIX: GridField button styling in reports 2013-08-29 13:56:29 +01: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
6d694a550a Merge pull request #837 from ARNHOE/3.1-siteconfigfix
SiteConfig updated to modeladmin style and fixed ajax switching
2013-08-28 02:20:47 -07:00
Sean Harvey
27749fdb7a AssetAdmin: PHP warning trying to add empty values into CompositeField
If the logged in user doesn't have permission to add a Folder record,
AssetAdmin::getEditForm() tries to enter an empty value into the
children of a ComposteField. This breaks SSViewer with a
call_user_func invalid args PHP warning.

Only include these buttons when they're available to the user.
2013-08-27 14:30:39 +12:00
Arno Poot
920da0d120 SiteConfig updated to modeladmin style and fixed ajax switching 2013-08-24 12:33:38 +02:00
Ingo Schommer
3dc86f98a3 Fixed merge error 2013-08-20 22:25:24 +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
44fdf66834 Merge pull request #809 from ARNHOE/3.1-siteconfig
Updated siteconfig layout to be more like modeladmin
2013-08-15 13:45:50 -07: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
Sam Minnée
d7d0cb45ae Merge pull request #824 from hafriedlander/fix/archivedate
FIX ArchiveDate enforcement
2013-08-08 17:38:53 -07:00
Simon Welsh
b1664f86a4 FIX Check for stage and drafts in SiteTree::canView() 2013-08-09 10:45:09 +12:00
Hamish Friedlander
2fae9280e5 FIX ArchiveDate enforcement 2013-08-08 17:17:35 +12:00
Ingo Schommer
99ba7bdb4e Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	lang/en.yml
	templates/CMSPageHistoryController_versions.ss
2013-08-07 17:15:17 +02:00
Ingo Schommer
07cccc8e95 Translations: Switch to Transifex format
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
  which SilverStripe's i18n system can't handle
  (needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
  issues with unknown locales in Zend's CLDR database
2013-08-04 12:31:29 +02:00
Ingo Schommer
3f118ef08f Translations: Switch to Transifex format
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
  which SilverStripe's i18n system can't handle
  (needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 12:28:07 +02:00
Loz Calver
09b869f5d3 Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798) 2013-07-31 09:30:58 +01:00
Arno Poot
afd9f28279 Updated siteconfig layout to be more like modeladmin 2013-07-26 17:45:28 +02:00
Simon Welsh
ff18abb994 Merge branch '3.0' into 3.1
Conflicts:
	.travis.yml
2013-07-14 17:24:06 +12:00
Simon Welsh
3a3e8f2faa Adds LoginForm as an allowed action
Behaves as a form method defined on ContentController
2013-07-14 17:21:59 +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
a2c2be2ad5 Correct form name in CMSFileAddController, fixes upload
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2172
2013-07-02 09:33:38 +02:00
Ingo Schommer
0bd257c8fc Merge pull request #770 from chillu/pulls/cmsform
Using new CMSForm class to allow for validation errors in CMS
2013-06-28 02:54:09 -07: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
aeacbc38aa Fix AssetAdmin::$allowed_actions 2013-06-21 00:54:28 +02:00
Jeremy Thomerson
b8908efdf7 ENHANCEMENT: allow sites to override meta generator tag 2013-06-17 20:35:14 +00:00
Mike Parkhill
c7f14129ea FIX #651 Broken redirection after creating new folder in assets 2013-06-13 14:58:09 +02:00
Ingo Schommer
2deb525d47 Using new CMSForm class to allow for validation errors in CMS
This class allows deferring handling of responses to the parent
controller's response negotiator implementation.
2013-06-13 07:44:37 +02: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
206f09ab65 Merge pull request #757 from mparkhill/651-assets-broken-redirection
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 15:04:22 -07:00
Mike Parkhill
85f5a45951 FIX #651 Broken redirection after creating new folder in assets 2013-05-27 17:21:07 +12: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
Simon Welsh
e8f6b416d7 Revert call to setCheckModelPermissions() 2013-05-25 13:56:02 +12:00
Sean Harvey
9c1a69ae08 Merge pull request #755 from patbolo/restored-page-correct-title
FIX Correct page title shown when restoring a page, instead of html of t...
2013-05-24 18:45:38 -07:00
jean
698a75d903 FIX Correct page title shown when restoring a page, instead of html of tree node 2013-05-25 11:37:26 +12:00
Will Rossiter
ae494b01bc Merge pull request #259 from chillu/pulls/perms-opt-in
FIX: Respect model permissions in AssetAdmin
2013-05-24 15:44:55 -07: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
Fred Condo
cd81d327ac Return 410 for successfullyinstalled after install files are gone
It was possible to append '/successfullyinstalled' to any SilverStripe
URL (with the cms module present), and the code would run, including
republishing the 404 page.

Now, if the install.php file is gone, this controller method throws the
410 (Gone) status code. The 410 status is chosen rather than 404 to
mitigate the likelihood that crawlers such as the Googlebot will follow
stray links to this URI.
2013-05-21 15:11:57 -07: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
Mateusz Uzdowski
6117057c59 Update doRollback messages to work well with the new reverts.
Currently reverts are not creating the new versions anymore - they are
simply copying the Version over. Remove incorrect message about new
version creation and remove the "cancel draft changes" message that's
not correct.
2013-05-16 08:43:12 +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
Will Rossiter
7c68414fe7 FIX: Rename search locale variable to avoid conflicts with locale switcher.
Fixes http://open.silverstripe.org/ticket/6204
2013-05-11 19:31:02 +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
c7ebf76757 Page history panel: show appropriate message when viewing latest version 2013-05-07 17:14:28 +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
d7435cde71 Merge pull request #676 from kinglozzer/urlsegmentfield-error-fix
Better error message when attempting to enter a blank URL Segment (fixes silverstripe/sapphire#1570)
2013-04-08 07:58:49 -07:00
Ingo Schommer
da515b8f65 FIX Use SSViewer.theme_enabled in CMS logic 2013-04-08 19:29:09 +12:00
Will Rossiter
6e2906d01e API: remove static related classes, now staticpublisher module 2013-04-06 17:26:15 +13:00
Loz Calver
ea446f2ade Better error message when attempting to enter a blank URL Segment (fixes silverstripe/silverstripe-cms#1570) 2013-04-05 14:06:32 +01: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
Ingo Schommer
1f14654649 CMSMain->LinkWithSearch() visibility
Required for tree links retaining search state
2013-03-19 22:13:10 +01:00
Ingo Schommer
c3b4d68664 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	code/controllers/SilverStripeNavigator.php
2013-03-19 14:04:24 +01:00
g4b0
9037aa8645 Re-indexed disallowed array because of json_encode issue with non-sequential array 2013-03-18 17:18:58 +01:00
uniun
5c933b40e5 BUG SilverStripeNavigator shows wrong message.
The message was always 'Published Site'.
Also there were no 'active' class on links.
2013-03-18 15:57:20 +02:00
Andrew Short
b5725c7ace Merge branch '3.0' into 3.1 2013-03-15 19:36:31 +11:00
Ingo Schommer
ec93643f49 NEW Set correct ParentID when creating page from list view 2013-03-14 19:00:56 +01:00
jean
2dd0e3f02e NEW Restored duplicate and duplicated with children functionality, as in 2.4 See ticket #7602
Conflicts:
	javascript/CMSMain.Tree.js
	templates/Includes/CMSMain_TreeView.ss
2013-03-13 10:04:09 +01:00
Ingo Schommer
a5e84c0a06 Merge pull request #294 from dhensby/request-patch
BUG Request object now has URL changed
2013-03-07 11:32:40 -08:00
Ingo Schommer
0f8d7a0aa4 Removed CMSMain->CMSVersion(), using LeftAndMain instead
Implementation got more complex (see https://github.com/silverstripe/silverstripe-cms/pull/289),
including composer.lock file support. So trying to to duplicate too much.
2013-02-28 13:39:13 +01:00
Daniel Hensby
eb2e0d7877 BUG Request object now has URL changed
Instead of cloning the Request object and losing all the custom
attributes that don't come through the construct (eg: headers) we can
now set the URL alone.
2013-02-28 08:51:25 +00:00
Sam Minnee
b7b62e5aea FIX: Fixed create-folder function: 2013-02-26 13:39:48 +13: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
537b0c6117 Define $allowed_actions consistently
Required due to stricter $allowed_actions checks in 3.1
2013-02-18 15:12:46 +13:00
Ingo Schommer
53c2059a01 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	code/controllers/SilverStripeNavigator.php
2013-02-07 21:44:41 +01: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
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
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
Ingo Schommer
97fbfd3f12 FIX Respect escaping rules on readonly fields in CMS history view
Avoids showing unescaped HTML on fields which didn't allow it otherwise,
e.g. TextField. This also fixes problems with SiteTree->ExtraMeta
which got evaluated within the CMS. If this section contains any
JavaScript it gets executed and can disrupt CMS operation.
2013-02-04 17:16:15 +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
UndefinedOffset
119d8aa892 ENHANCEMENT: Do not display SilverStripeNavigator_CMSLink when in a LeftAndMain extension not just CMSMain extensions 2013-02-01 14:16:19 -04: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
eba4d205c3 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 12:44:40 +01:00
Ingo Schommer
416178b668 Reduced code duplication in ErrorPage (no functional changes) 2013-01-29 19:34:05 +01:00
Ingo Schommer
b15b98345f Using new "Security.login_url" configuration value 2013-01-29 18:06:49 +01:00
Ingo Schommer
649de6e1bc BUG Reinstated CMS "History" Preview (fixes ##8089) 2013-01-25 11:35:48 +01:00
Kirk Mayo
81cd0e6e04 BUG: Replaced extendedSQL with DataList as per ticket 8183 2013-01-24 08:45:30 +13:00
Ingo Schommer
317977a227 More useful default cols on "Pages" list (fixes #8199) 2013-01-22 15:37:20 +01: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
8a9acaa5ba Fixed "add page" type icons (fixes #8190) 2013-01-17 19:59:54 +01:00
Ingo Schommer
93bee9422a Don't duplicate SS_Report title in GridField 2013-01-14 17:12:27 +01:00
Ingo Schommer
76aeec70e7 NEW SiteTree->PreviewLink() for fine grained URL control 2013-01-14 17:12:23 +01:00
Andrew O'Neil
f9504ee983 ENHANCEMENT Writing caching metadata as HTML comments in FilesystemPublisher (through StaticPublisher::$include_caching_metadata) (ischommer) 2013-01-14 17:08:12 +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
ffc6d6ffad BUGFIX Disable CMS preview for RedirectorPage (fixes #7127)
If the redirect is to an internal page, the preview iframe
will automatically load this new URL, causing the CMS edit
form to switch as well - effectively making it impossible
to edit a redirector page in the CMS as soon as it is saved
with an internal redirection target.
2013-01-09 21:44:52 +01:00