tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

MERGE subsite treedropdown fix from trunk (from r86329)

Browse Source
This commit is contained in:
Tom Rix 2010-03-01 03:05:13 +00:00
parent 9e63443b97
commit f7dba96157
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/RelatedPageLink.php
View File

@ -38,6 +38,11 @@ class RelatedPageLink extends DataObject {
"MenuTitle" "MenuTitle"
); );
if(Controller::curr()->getRequest()) {
$subsiteID = Controller::curr()->getRequest()->getVar('TreeDropdownField_ComplexTableField_Popup_AddForm_RelatedPageID_SubsiteID');
$pageSelectionField->setSubsiteID($subsiteID);
}
$pageSelectionField->setFilterFunction(create_function('$item', 'return $item->ClassName != "VirtualPage";')); $pageSelectionField->setFilterFunction(create_function('$item', 'return $item->ClassName != "VirtualPage";'));
if($subsites->Count()) { if($subsites->Count()) {

28
javascript/SubsitesTreeDropdownField.js
View File

@ -1,15 +1,26 @@
SubsitesTreeDropdownField = Class.extend('TreeDropdownField'); SubsitesTreeDropdownField = Class.extend('TreeDropdownField');
SubsitesTreeDropdownField.prototype = { SubsitesTreeDropdownField.prototype = {
//subsiteID: null, subsiteID: function() {
var subsiteSel = $$('#CopyContentFromID_SubsiteID select')[0];
subsiteSel.onchange = (function() {
this.createTreeNode(true);
this.ajaxGetTree((function(response) {
this.newTreeReady(response, true);
this.updateTreeLabel();
}).bind(this));
}).bind(this);
return subsiteSel.options[subsiteSel.selectedIndex].value;
},
ajaxGetTree: function(after) { ajaxGetTree: function(after) {
// This if block is necessary to maintain both 2.2 and 2.3 support
var baseURL = this.helperURLBase(); var baseURL = this.helperURLBase();
// Can't force value because it might be on a different subsite! if(baseURL.match('action_callfieldmethod')) var ajaxURL = baseURL+ '&methodName=gettree&forceValues=' + this.inputTag.value;
var ajaxURL = baseURL+ 'gettree?forceValues=' + 0; //this.inputTag.value; else var ajaxURL = baseURL+ 'gettree?forceValues=' + this.inputTag.value;
// Customised: Append subsiteid (evaluated in SubsitesVirtualPage.php) // Customized: Append subsiteid (evaluated in SubsitesVirtualPage.php)
ajaxURL += '&' + this.id + '_SubsiteID=' + parseInt(this.subsiteID); ajaxURL += '&' + this.id + '_SubsiteID=' + parseInt(this.subsiteID());
ajaxURL += $('SecurityID') ? '&SecurityID=' + $('SecurityID').value : ''; ajaxURL += $('SecurityID') ? '&SecurityID=' + $('SecurityID').value : '';
new Ajax.Request(ajaxURL, { new Ajax.Request(ajaxURL, {
@ -25,8 +36,11 @@ SubsitesTreeDropdownField.prototype = {
var ul = this.treeNodeHolder(); var ul = this.treeNodeHolder();
ul.innerHTML = ss.i18n._t('LOADING'); ul.innerHTML = ss.i18n._t('LOADING');
// This if block is necessary to maintain both 2.2 and 2.3 support
var baseURL = this.options.dropdownField.helperURLBase(); var baseURL = this.options.dropdownField.helperURLBase();
var ajaxURL = baseURL+ 'getsubtree?SubtreeRootID=' + this.getIdx();
if(baseURL.match('action_callfieldmethod')) var ajaxURL = baseURL+ '&methodName=getsubtree&SubtreeRootID=' + this.getIdx();
else var ajaxURL = baseURL+ 'getsubtree?SubtreeRootID=' + this.getIdx();
// Find the root of the tree - this points to a list item in the tree, not the root div we actually want // Find the root of the tree - this points to a list item in the tree, not the root div we actually want
// @todo: We should be using framework API calls to find the tree // @todo: We should be using framework API calls to find the tree
@ -34,7 +48,7 @@ SubsitesTreeDropdownField.prototype = {
while (tree && !tree.className.match(/(^| )SubsitesTreeDropdownField( |$)/)) tree = tree.parentNode; while (tree && !tree.className.match(/(^| )SubsitesTreeDropdownField( |$)/)) tree = tree.parentNode;
// Customized: Append subsiteid (evaluated in SubsitesVirtualPage.php) // Customized: Append subsiteid (evaluated in SubsitesVirtualPage.php)
ajaxURL += '&' + tree.id + '_SubsiteID=' + parseInt(tree.subsiteID); ajaxURL += '&' + this.id + '_SubsiteID=' + parseInt(this.subsiteID());
ajaxURL += $('SecurityID') ? '&SecurityID=' + $('SecurityID').value : ''; ajaxURL += $('SecurityID') ? '&SecurityID=' + $('SecurityID').value : '';
new Ajax.Request(ajaxURL, { new Ajax.Request(ajaxURL, {