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

Merge pull request #770 from chillu/pulls/cmsform

Browse Source 
Using new CMSForm class to allow for validation errors in CMS
This commit is contained in:
Ingo Schommer 2013-06-28 02:54:09 -07:00
commit 0bd257c8fc
7 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/AssetAdmin.php
View File

@ -396,7 +396,7 @@ JS
public function AddForm() {
$folder = singleton('Folder');
$form = new Form(
$form = CMSForm::create(
$this,
'AddForm',
new FieldList(
@ -408,7 +408,8 @@ JS
->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept')
->setTitle(_t('AssetAdmin.ActionAdd', 'Add folder'))
)
);
)->setHTMLID('Form_AddForm');
$form->setResponseNegotiator($this->getResponseNegotiator());
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
// TODO Can't merge $FormAttributes in template at the moment
$form->addExtraClass('add-form cms-add-form cms-edit-form cms-panel-padded center ' . $this->BaseCSSClasses());

5
code/controllers/CMSFileAddController.php
View File

@ -76,7 +76,7 @@ class CMSFileAddController extends LeftAndMain {
asort($exts);
$uploadField->Extensions = implode(', ', $exts);
$form = new Form(
$form = CMSForm::create(
$this,
'getEditForm',
new FieldList(
@ -84,7 +84,8 @@ class CMSFileAddController extends LeftAndMain {
new HiddenField('ID')
),
new FieldList()
);
)->setHTMLID('Form_getEditForm');
$form->setResponseNegotiator($this->getResponseNegotiator());
$form->addExtraClass('center cms-edit-form ' . $this->BaseCSSClasses());
// Don't use AssetAdmin_EditForm, as it assumes a different panel structure
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));

16
code/controllers/CMSMain.php
View File

@ -663,7 +663,10 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$validator = new RequiredFields();
}
$form = new Form($this, "EditForm", $fields, $actions, $validator);
$form = CMSForm::create(
$this, "EditForm", $fields, $actions, $validator
)->setHTMLID('Form_EditForm');
$form->setResponseNegotiator($this->getResponseNegotiator());
$form->loadDataFrom($record);
$form->disableDefaultAction();
$form->addExtraClass('cms-edit-form');
@ -686,9 +689,11 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$this->extend('updateEditForm', $form);
return $form;
} else if($id) {
return new Form($this, "EditForm", new FieldList(
$form = CMSForm::create( $this, "EditForm", new FieldList(
new LabelField('PageDoesntExistLabel',_t('CMSMain.PAGENOTEXISTS',"This page doesn't exist"))), new FieldList()
);
)->setHTMLID('Form_EditForm');
$form->setResponseNegotiator($this->getResponseNegotiator());
return $form;
}
}
@ -788,13 +793,14 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
));
$listview = new Form(
$listview = CMSForm::create(
$this,
'ListViewForm',
new FieldList($gridField),
new FieldList()
);
)->setHTMLID('Form_ListViewForm');
$listview->setAttribute('data-pjax-fragment', 'ListViewForm');
$listview->setResponseNegotiator($this->getResponseNegotiator());
$this->extend('updateListView', $listview);

5
code/controllers/CMSPageAddController.php
View File

@ -106,7 +106,10 @@ class CMSPageAddController extends CMSPageEditController {
$this->extend('updatePageOptions', $fields);
$form = new Form($this, "AddForm", $fields, $actions);
$form = CMSForm::create(
$this, "AddForm", $fields, $actions
)->setHTMLID('Form_AddForm');
$form->setResponseNegotiator($this->getResponseNegotiator());
$form->addExtraClass('cms-add-form stacked cms-content center cms-edit-form ' . $this->BaseCSSClasses());
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));

6
code/controllers/CMSPageHistoryController.php
View File

@ -251,13 +251,13 @@ class CMSPageHistoryController extends CMSMain {
// Use <button> to allow full jQuery UI styling
foreach($actions->dataFields() as $action) $action->setUseButtonTag(true);
$form = new Form(
$form = CMSForm::create(
$this,
'VersionsForm',
$fields,
$actions
);
)->setHTMLID('Form_VersionsForm');
$form->setResponseNegotiator($this->getResponseNegotiator());
$form->loadDataFrom($this->request->requestVars());
$hiddenID->setValue($id);
$form->unsetValidator();

5
code/controllers/CMSSettingsController.php
View File

@ -37,7 +37,10 @@ class CMSSettingsController extends LeftAndMain {
$navField->setAllowHTML(true);
$actions = $siteConfig->getCMSActions();
$form = new Form($this, 'EditForm', $fields, $actions);
$form = CMSForm::create(
$this, 'EditForm', $fields, $actions
)->setHTMLID('Form_EditForm');
$form->setResponseNegotiator($this->getResponseNegotiator());
$form->addExtraClass('root-form');
$form->addExtraClass('cms-edit-form cms-panel-padded center');
// don't add data-pjax-fragment=CurrentForm, its added in the content template instead

5
code/controllers/ReportAdmin.php
View File

@ -171,7 +171,10 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
}
$actions = new FieldList();
$form = new Form($this, "EditForm", $fields, $actions);
$form = CMSForm::create(
$this, "EditForm", $fields, $actions
)->setHTMLID('Form_EditForm');
$form->setResponseNegotiator($this->getResponseNegotiator());
$form->addExtraClass('cms-edit-form cms-panel-padded center ' . $this->BaseCSSClasses());
$form->loadDataFrom($this->request->getVars());