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

fixing double use declarations of Subsite class

Browse Source
This commit is contained in:
Werner M. Krauß 2017-05-24 14:31:36 +02:00
parent 8aa6512a49
commit fe6d93eaac
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/extensions/ErrorPageSubsite.php
View File

@ -6,7 +6,6 @@ namespace SilverStripe\Subsites\Extensions;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataExtension; use SilverStripe\ORM\DataExtension;
use SilverStripe\Subsites\Model\Subsite; use SilverStripe\Subsites\Model\Subsite;
use SilverStripe\Subsites\Model\Subsite;
class ErrorPageSubsite extends DataExtension { class ErrorPageSubsite extends DataExtension {

1
code/extensions/FileSubsites.php
View File

@ -13,7 +13,6 @@ use SilverStripe\Control\Session;
use SilverStripe\Security\Permission; use SilverStripe\Security\Permission;
use SilverStripe\ORM\DataExtension; use SilverStripe\ORM\DataExtension;
use SilverStripe\Subsites\Model\Subsite; use SilverStripe\Subsites\Model\Subsite;
use SilverStripe\Subsites\Model\Subsite;
/** /**

11
code/forms/GridFieldSubsiteDetailForm.php
View File

@ -7,7 +7,6 @@ use SilverStripe\Forms\GridField\GridFieldDetailForm;
use SilverStripe\Forms\DropdownField; use SilverStripe\Forms\DropdownField;
use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest; use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
use SilverStripe\Subsites\Forms\GridFieldSubsiteDetailForm_ItemRequest;
use SilverStripe\Subsites\Model\Subsite; use SilverStripe\Subsites\Model\Subsite;
@ -24,17 +23,17 @@ class GridFieldSubsiteDetailForm_ItemRequest extends GridFieldDetailForm_ItemReq
/** /**
* Builds an item edit form. The arguments to getCMSFields() are the popupController and * Builds an item edit form. The arguments to getCMSFields() are the popupController and
* popupFormName, however this is an experimental API and may change. * popupFormName, however this is an experimental API and may change.
* *
* @todo In the future, we will probably need to come up with a tigher object representing a partially * @todo In the future, we will probably need to come up with a tigher object representing a partially
* complete controller with gaps for extra functionality. This, for example, would be a better way * complete controller with gaps for extra functionality. This, for example, would be a better way
* of letting Security/login put its log-in form inside a UI specified elsewhere. * of letting Security/login put its log-in form inside a UI specified elsewhere.
* *
* @return Form * @return Form
* @see GridFieldDetailForm_ItemRequest::ItemEditForm() * @see GridFieldDetailForm_ItemRequest::ItemEditForm()
*/ */
function ItemEditForm() { function ItemEditForm() {
$form=parent::ItemEditForm(); $form=parent::ItemEditForm();
if($this->record->ID == 0) { if($this->record->ID == 0) {
$templates = Subsite::get()->sort('Title'); $templates = Subsite::get()->sort('Title');
$templateArray = array(); $templateArray = array();
@ -46,10 +45,10 @@ class GridFieldSubsiteDetailForm_ItemRequest extends GridFieldDetailForm_ItemReq
$templateDropdown->setEmptyString('(' . _t('Subsite.NOTEMPLATE', 'No template') . ')'); $templateDropdown->setEmptyString('(' . _t('Subsite.NOTEMPLATE', 'No template') . ')');
$form->Fields()->addFieldToTab('Root.Configuration', $templateDropdown); $form->Fields()->addFieldToTab('Root.Configuration', $templateDropdown);
} }
return $form; return $form;
} }
function doSave($data, $form) { function doSave($data, $form) {
$new_record = $this->record->ID == 0; $new_record = $this->record->ID == 0;
if($new_record && isset($data['TemplateID']) && !empty($data['TemplateID'])) { if($new_record && isset($data['TemplateID']) && !empty($data['TemplateID'])) {