mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
MINOR Reverted 'single instance only' feature from r79868, delayed until later release (see #4277)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97182 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
d40afc9cdc
commit
cda3d5ae2a
@ -556,12 +556,11 @@ class LeftAndMain extends Controller {
|
||||
$id = $p->ID ? $p->ID : "new-$p->class-$p->ParentID";
|
||||
$treeTitle = Convert::raw2js($p->TreeTitle());
|
||||
$hasChildren = (is_numeric($id) && $p->AllChildren() && $p->AllChildren()->Count()) ? ' unexpanded' : '';
|
||||
$singleInstanceCSSClass = $p->stat('single_instance_only') ? $p->stat('single_instance_only_css_class') : "";
|
||||
|
||||
// Ensure there is definitly a node avaliable. if not, append to the home tree.
|
||||
$response = <<<JS
|
||||
var tree = $('sitetree');
|
||||
var newNode = tree.createTreeNode("$id", "$treeTitle", "{$p->class}{$hasChildren} {$singleInstanceCSSClass}");
|
||||
var newNode = tree.createTreeNode("$id", "$treeTitle", "{$p->class}{$hasChildren}");
|
||||
node = tree.getTreeNodeByIdx($parentID);
|
||||
if(!node) {
|
||||
node = tree.getTreeNodeByIdx(0);
|
||||
@ -571,7 +570,6 @@ class LeftAndMain extends Controller {
|
||||
newNode.selectTreeNode();
|
||||
JS;
|
||||
FormResponse::add($response);
|
||||
FormResponse::add($this->hideSingleInstanceOnlyFromCreateFieldJS($p));
|
||||
|
||||
return FormResponse::respond();
|
||||
} else {
|
||||
@ -704,20 +702,6 @@ JS;
|
||||
|
||||
$record->write();
|
||||
|
||||
// if changed to a single_instance_only page type
|
||||
if ($record->stat('single_instance_only')) {
|
||||
FormResponse::add("jQuery('#sitetree li.{$record->ClassName}').addClass('{$record->stat('single_instance_only_css_class')}');");
|
||||
FormResponse::add($this->hideSingleInstanceOnlyFromCreateFieldJS($record));
|
||||
}
|
||||
else {
|
||||
FormResponse::add("jQuery('#sitetree li.{$record->ClassName}').removeClass('{$record->stat('single_instance_only_css_class')}');");
|
||||
}
|
||||
// if chnaged from a single_instance_only page type
|
||||
$sampleOriginalClassObject = new $originalClass();
|
||||
if($sampleOriginalClassObject->stat('single_instance_only')) {
|
||||
FormResponse::add($this->showSingleInstanceOnlyInCreateFieldJS($sampleOriginalClassObject));
|
||||
}
|
||||
|
||||
if( ($record->class != 'VirtualPage') && $originalURLSegment != $record->URLSegment) {
|
||||
$message .= sprintf(_t('LeftAndMain.CHANGEDURL'," Changed URL to '%s'"),$record->URLSegment);
|
||||
FormResponse::add("\$('Form_EditForm').elements.URLSegment.value = \"$record->URLSegment\";");
|
||||
@ -761,54 +745,6 @@ JS;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a javascript snippet that hides a page type from Create dropdownfield
|
||||
* if it's a single_instance_only page type and has been created in the site tree
|
||||
*/
|
||||
protected function hideSingleInstanceOnlyFromCreateFieldJS($createdPage) {
|
||||
// Prepare variable to single_instance_only checking in javascript
|
||||
$pageClassName = $createdPage->class;
|
||||
$singleInstanceCSSClass = "";
|
||||
$singleInstanceClassSelector = "." . $createdPage->stat('single_instance_only_css_class');
|
||||
if ($createdPage->stat('single_instance_only')) {
|
||||
$singleInstanceCSSClass = $createdPage->stat('single_instance_only_css_class');
|
||||
}
|
||||
|
||||
return <<<JS
|
||||
// if the current page type that was created is single_instance_only,
|
||||
// hide it from the create dropdownlist afterward
|
||||
singleSingleOnlyOfThisPageType = jQuery("#sitetree li.{$pageClassName}{$singleInstanceClassSelector}");
|
||||
|
||||
if (singleSingleOnlyOfThisPageType.length > 0) {
|
||||
jQuery("#" + _HANDLER_FORMS.addpage + " option[@value={$pageClassName}]").remove();
|
||||
}
|
||||
JS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a javascript snippet that that shows a single_instance_only page type in Create dropdownfield
|
||||
* if there isn't any of its instance in the site tree
|
||||
*/
|
||||
protected function showSingleInstanceOnlyInCreateFieldJS($deletedPage) {
|
||||
$className = $deletedPage->class;
|
||||
$singularName = $deletedPage->singular_name();
|
||||
$singleInstanceClassSelector = "." . $deletedPage->stat('single_instance_only_css_class');
|
||||
return <<<JS
|
||||
// show the hidden single_instance_only page type in the create dropdown field
|
||||
singleSingleOnlyOfThisPageType = jQuery("#sitetree li.{$className}{$singleInstanceClassSelector}");
|
||||
|
||||
if (singleSingleOnlyOfThisPageType.length == 0) {
|
||||
if(jQuery("#" + _HANDLER_FORMS.addpage + " option[@value={$className}]").length == 0) {
|
||||
jQuery("#" + _HANDLER_FORMS.addpage + " select option").each(function(){
|
||||
if ("{$singularName}".toLowerCase() >= jQuery(this).val().toLowerCase()) {
|
||||
jQuery("<option value=\"{$className}\">{$singularName}</option>").insertAfter(this);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
JS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a piece of javascript that will update the actions of the main form
|
||||
*/
|
||||
@ -858,7 +794,6 @@ JS;
|
||||
$this->setCurrentPageID(null);
|
||||
}
|
||||
|
||||
if ($this instanceof LeftAndMain) FormResponse::add($this->showSingleInstanceOnlyInCreateFieldJS($page));
|
||||
return FormResponse::respond();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user