Commit Graph

164 Commits

Author SHA1 Message Date
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 76be14b1fccc05b5dcca8c805e0354a42e75135d
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:28:18 2012 +1200

    FIXED: Indentation

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

    FIXED: Coding style inconsistencies

commit 6395f9030ed65b24494842ce74864ff7ebbf6c5e
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 aca242e31c8d98ee3b8acc397bf605ceb964e1bf
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
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
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
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
Ingo Schommer
4986355e3f MINOR Simplified page type dropdown labels, removed redundant info (fixes #7474) 2012-06-15 16:22:27 +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
ad28780959 MINOR Use shorthand syntax for DataList querying 2012-05-28 21:05:24 +12:00
Ingo Schommer
1614bc4505 MINOR Removed unknown "cancel draft" button icon (fixes #7333) 2012-05-20 14:20:59 +02:00
Ingo Schommer
af48b3948b Merge pull request #121 from chillu/silverstripe-cms
---

....Main" to "Root.Main", merged "Root.Content.Metadata" tab into "Root.Main"

See https://github.com/silverstripe/sapphire/pull/420

Conflicts:
	code/model/SiteTree.php
2012-05-11 14:03:44 +02:00
Ingo Schommer
1863bb00db ENHANCEMENT Refactored SiteTreeURLSegmentField JS to a more selector based approach (future proof field for reusability e.g. in ModelAdmin with custom DataObject URL previews) 2012-05-10 14:50:08 +02:00
Ryan Wachtl
bd94c6f336 Trac 6981: Opt-in URL Updating 2012-05-09 19:01:57 -05:00
Ingo Schommer
42d404faa8 API CHANGE Restructured SiteTree->getCMSFields() tabs from "Root.Content.Main" to "Root.Main", merged "Root.Content.Metadata" tab into "Root.Main" (fixes #7261) 2012-05-09 17:48:59 +02:00
Ingo Schommer
d15b4ad8ee Merge pull request #119 from chillu/urlsegment-multibyte-fix
Urlsegment multibyte fix
2012-05-09 01:32:52 -07: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
63536af875 MINOR Documentation 2012-05-08 22:22:11 +02:00
Ingo Schommer
38f1236b1f MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:05:19 +02:00
Ingo Schommer
8c1651ec59 MINOR Using GridField instead of TableListField for SiteTree->getCMSFields() DependentPages (fixes #7239) 2012-04-30 16:10:24 +02:00
Ingo Schommer
a73e45769a ENHANCEMENT Titles for lozenges in page tree for more context (fixes #7206) 2012-04-30 14:56:42 +02:00
Sean Harvey
614f307a37 ENHANCEMENT When loading CMS, ensure that "Parent page" tree dropdown is
either hidden or shown depending on initial "Page location" state
2012-04-23 21:02:29 +12:00
Ingo Schommer
ca853d73f2 ENHANCEMENT Renamed "Content" tab in SiteTree->getCMSFields() to "Main Content" to distinguish it from the top-level "Content" tag 2012-04-18 16:28:07 +02: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
6aeac37906 API CHANGE Combined "Pages" and "Edit Page" into a single menu entry
ENHANCEMENT Namespaced tree search parameters in CMSMain, in order to detect more reliably if a filter has been applied. Changing page search form to standard pushState behaviour, same as ModelAdmin (for both tree and list view).
MINOR Refactored list view loading
2012-04-17 22:59:08 +02:00
Ingo Schommer
52e69dd1fd MINOR Removed usage of deprecated $priority argument for _t() 2012-04-15 16:49:31 +02:00
Ingo Schommer
2dc0e72c00 ENHANCEMENT Caching expensive CMSMain->SiteTreeHints() call on disk 2012-04-15 16:49:31 +02:00
Ingo Schommer
d9c4aa8583 MINOR Using new DataObject::fieldLabels() caching in SiteTree 2012-04-15 16:49:30 +02:00
Simon Welsh
c4e018928e API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:56:40 +12:00
Will Rossiter
d4750c2a96 MINOR: group ShowInMenus and ShowInSearch check boxes. Fixes #6901 2012-04-14 18:16:47 +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
73a466c927 Merge branch 'integration' 2012-04-11 16:25:46 +02:00
Sam Minnee
7213d2b7dc MINOR: Clarified meaning of SiteTree:: 2012-04-11 15:48:17 +12:00
Ingo Schommer
f021b9eec1 BUGFIX Writing version in SiteTree->doRestoreToStage, regression from 9451993d (fixes #7107) 2012-04-10 12:27:08 +02:00
Ingo Schommer
76f4e6d93b Merge branch 'master' into integration 2012-04-09 21:08:37 +02:00
Normann Lou
7d9873472b ENHANCEMENT SSF-124 customise displayed fields of page list view, add children list view links 2012-04-05 17:33:37 +12:00
Normann Lou
c1b248e2cf ENHANCEMENT SiteTree->getStatusFlags() which makes SiteTree->getTreeTitle() extensible 2012-04-04 23:02:53 +02:00
Ingo Schommer
de573e087d MINOR Using late static binding instead of Object::create() calls 2012-04-04 18:29:11 +02: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
1d6d24671c Merge branch 'integration'
Conflicts:
	code/controllers/AssetAdmin.php
2012-03-08 20:13:53 +01:00
Ingo Schommer
12124fdae0 MINOR Simplified "Meta" field labelling in SiteTree->getCMSFields() (removed header) 2012-03-07 13:48:52 +01:00
Ingo Schommer
b29a7540a2 MINOR Fixed usage of deprecated FormField->describe() API 2012-03-07 13:32:44 +01:00
Sam Minnée
703ac7b47e Merge pull request #62 from silverstripe-scienceninjas/master
BUGFIX: SiteTree#getCMSFields would only calculate local variable $linkedPages if ID was valid, but would then refer to that variable regardless
2012-03-05 13:08:22 -08:00
Ingo Schommer
e0a67a80c7 BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code. 2012-03-05 18:42:44 +01:00
Ingo Schommer
e938c60e9a ENHANCEMENT Using chosen.js selection instead of a TreeDropdownField to select groups in SiteConfig->getCMSFields() and SiteTree->getCMSFields() 2012-03-05 18:42:42 +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
Hamish Friedlander
3b0ab9b0a0 BUGFIX: SiteTree#getCMSFields referenced $linkedPages even if $linkedPages wasnt set 2012-02-17 12:06:12 +13:00
Cam Findlay
21289128bb MINOR SiteTreeURLSegmentField has new methods to aid in displaying URL prefix and secondary information text (fixes #6852) 2012-02-14 11:12:47 +01:00
Will Rossiter
8fe767b5f2 FEATURE: move breadcrumbs out to a customizable template 2012-02-11 15:13:51 +13:00
Will Rossiter
95f35cc0d2 Merge pull request #59 from simonwelsh/master
BUGFIX Page location radio buttons update ParentID accordingly
2012-02-10 17:18:25 -08:00
Simon Welsh
a519411629 BUGFIX Page location radio buttons update ParentID accordingly 2012-02-11 14:13:38 +13:00
Jeremy Thomerson
3c3b27d3cb ENHANCEMENT Allow the homepage to have a different URL
If you changed the URL segment for your homepage to anything other than 'home'
a new homepage would be created every time you ran a dev/build.  This commit
allows you to call RootURLController::set_default_homepage_link('something');
to change the URL segment for your homepage to 'something'.  After doing this
the dev/build process will no longer create a homepage if you already have a
page with 'something' as the URL segment.

There was a discussion of needing this at
http://www.silverstripe.org/general-questions/show/12253
2012-02-03 03:24:00 +00:00
Ingo Schommer
36a867f737 MINOR Documentation 2012-01-24 14:20:55 +01:00
Jeremy Thomerson
82bb4ca2f5 Add a deprecation-friendly version of the prepopulate_permission_cache function
Add a function with the old function name that adds a deprecation warning for
users but forwards the call to the renamed function for backwards-compatibility.
2012-01-23 15:23:42 -05:00
Jeremy Thomerson
a5c6bc6ee1 Fix typo in function name
There was a function named "SiteTree::prepopuplate_permission_cache" which
should be "SiteTree::prepopulate_permission_cache".
2012-01-23 14:28:55 -05:00
Wolf Vollprecht
f8f5a36640 ENHANCEMENT 6631 Visual grouping of FormAction 2012-01-18 03:18:11 +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
4140ddad5e MINOR Using new DataList API for DependentPages in SiteTree->getCMSFields() 2012-01-04 18:06:04 +01:00
Ingo Schommer
e35991b363 MINOR Misc styling fixes around dialogs and "add page" styling 2012-01-03 17:57:04 +01:00
Ingo Schommer
7a1e25ba71 MINOR Shorter tree title badges 2011-12-29 10:30:21 +01:00
Wolf Vollprecht
afecc6b20b ENHANCEMENT: #6579 Show page status in page tree 2011-12-22 15:11:41 +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
Ingo Schommer
9540e248e7 MINOR Removed unnecessary variable declaration in SiteTree (thanks mattclegg) 2011-12-17 01:50:15 +01:00
Ingo Schommer
020f480256 MINOR Using <span> instead of <del>/<ins> in SiteTree->getTreeTitle() to avoid conflicting styles with jstree 2011-12-12 23:10:48 +01:00
Ingo Schommer
b4eda409c2 ENHANCEMENT Replaced client side URL filtering in CMS with ajax callbacks to new SiteTreeURLSegmentField, in order to align with extended server side logic (and avoid pre-filtering values too heavily before passing them to the server). Removed suggestions from client side user confirmation. 2011-11-14 15:29:19 +01:00
Ingo Schommer
81aeb8d378 ENHANCEMENT Using new URLPathFilter API in SiteTree->generateURLSegment(), allowing customisation of URL filtering and transliteration 2011-11-14 12:28:25 +01:00
Sam Minnee
5b8f6edaec MINOR: Use SS_Map::keys() and SS_Map::values() instead of array_keys() / array_values() 2011-10-29 17:41:52 +13:00
Sam Minnee
1f34973da1 MINOR: Use leftJoin() / innerJoin() instead of join(). 2011-10-29 17:41:52 +13:00
Sam Minnee
4e7cb308d5 MINOR: Use Deprecation class to indicated deprecated methods in cms. 2011-10-29 17:41:06 +13:00
Sam Minnée
d63bcb63ae Merge pull request #30 from frankmullenger/master
Removing Unpublish button from CMS when canDeleteFromLive() returns false
2011-10-28 21:34:13 -07:00
Stig Lindqvist
d799c80cc5 API CHANGE Changed name from DataObjectSet to either ArrayList or DataList 2011-10-27 20:24:45 +02:00
Stig Lindqvist
05e90838c0 API CHANGE Switch usage from FieldSet to FieldList 2011-10-27 20:24:45 +02:00
Frank Mullenger
916309e6c6 BUGFIX returning false from canDeleteFromLive() for a DataObject did not remove the Unpublish button from CMS, but the Unpublish action returned an error. Fixes #6731. 2011-10-08 17:14:54 +13: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
d64e847534 BUGFIX: Don't turn virtual pages green if their source is deleted from draft and then reverted (merged from r100926 and r100928) 2011-10-07 10:07:38 +02:00
Ingo Schommer
f368686adc MINOR Documentation 2011-10-07 10:06:06 +02:00
Ingo Schommer
987eedf9ba BUGFIX Don't fail SiteTree::batch_permission_check() is no published pages exist 2011-10-07 09:38:35 +02:00
Ingo Schommer
e26d249d60 BUGFIX Consistently resetting Subsite::$disable_subsite_filter to its original state (if the module is installed) 2011-10-07 09:38:11 +02:00
Ingo Schommer
6ab1340680 BUGFIX Using SiteTree->getSiteConfig() instead of SiteConfig::current_site_config() in SiteTree::batch_permission_check() to avoid cases where multiple variances of SiteConfig need to be considered (e.g. when using the subsites module) (AIR-59) 2011-10-07 09:34:53 +02:00
Ingo Schommer
1fcc987b78 MINOR Documentation for SiteTree::batch_permission_check() 2011-10-07 09:34:28 +02:00
Ingo Schommer
45f857e042 MINOR Removing class comparison in SiteTree->canCreate() (mainly in order to enable overloading via SiteTreeSubsite->canCreate()) 2011-10-07 09:31:29 +02:00
Ingo Schommer
4903fad537 BUGFIX Checking for SiteTree:: in SiteTree->getClassDropdown() (AIR-20) 2011-10-07 09:29:03 +02:00
Ingo Schommer
922dd126c6 MINOR Allowing TRUE vetoes in SiteTree->augmentValidURLSegment() (in addition to the existing FALSE vetoes) 2011-10-07 09:19:40 +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
Sam Minnee
f2ed229be4 API CHANGE: Removed context object - it's a hack. 2011-10-07 08:50:52 +02:00
Sam Minnee
d3ca4dac5b BUGFIX: Updated models to suit minor changes in the new ORM. 2011-10-07 08:50:51 +02:00
Ingo Schommer
d0b419c5a9 ENHANCEMENT Showing class names in ClassDropDown in not en_US (fixes #6325, thanks dhensby) 2011-09-19 14:40:01 +02:00
Ingo Schommer
5de2ba5628 MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:42 +02:00
Ingo Schommer
4eebf7f0be ENHANCEMENT Shortened CMS button labels: "Delete from the draft site" -> "Delete draft", "Delete from the published site" -> "Delete", "Save and Publish" -> "Save & Publish". Renamed "Save" to "Save draft" 2011-08-12 17:06:35 +02:00
Ingo Schommer
ab3fe3e638 ENHANCEMENT Implementing CMSPreviewable in SiteTree 2011-08-12 17:06:35 +02:00