Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update deprecated API
Code cleanup
  • Loading branch information
Damian Mooyman committed Jan 10, 2017
1 parent 8410ccb commit 813e75a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 33 deletions.
22 changes: 11 additions & 11 deletions _config.php
Expand Up @@ -13,19 +13,19 @@
SiteTree::add_extension('FrameworkTestSiteTreeExtension');
File::add_extension('FrameworkTestFileExtension');

if(class_exists('SiteTreeCMSWorkflow')) {
SiteConfig::add_extension('CMSWorkflowSiteConfigDecorator');
CMSWorkflowSiteConfigDecorator::apply_active_config();
if (class_exists('SiteTreeCMSWorkflow')) {
SiteConfig::add_extension('CMSWorkflowSiteConfigDecorator');
CMSWorkflowSiteConfigDecorator::apply_active_config();
}

if(@$_GET['db']) {
$enabletranslatable = @$_GET['enabletranslatable'];
} elseif(@$_SESSION['db']) {
$enabletranslatable = @$_SESSION['enabletranslatable'];
if (!empty($_GET['db'])) {
$enabletranslatable = $_GET['enabletranslatable'];
} elseif (!empty($_SESSION['db'])) {
$enabletranslatable = $_SESSION['enabletranslatable'];
} else {
$enabletranslatable = null;
$enabletranslatable = null;
}
if($enabletranslatable) {
SiteTree::add_extension('Translatable');
SiteConfig::add_extension('Translatable');
if ($enabletranslatable) {
SiteTree::add_extension('Translatable');
SiteConfig::add_extension('Translatable');
}
2 changes: 0 additions & 2 deletions code/BasicFieldsTestPage.php
Expand Up @@ -56,8 +56,6 @@ class BasicFieldsTestPage extends TestPage
'Required' => 'Text',
'Text' => 'Varchar',
'Textarea' => 'Text',
'Required' => 'Varchar',
'Readonly' => 'Varchar',
'Time' => 'Time',
'ToggleCompositeTextField1' => 'Varchar',
'ToggleCompositeDropdownField' => 'Varchar',
Expand Down
29 changes: 9 additions & 20 deletions code/Company.php
Expand Up @@ -2,21 +2,13 @@

namespace SilverStripe\FrameworkTest\Model;





use SilverStripe\ORM\ValidationResult;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB;
use SilverStripe\Forms\UploadField;




class Company extends DataObject
{

private static $table_name = 'Company';

/**
Expand All @@ -34,7 +26,7 @@ class Company extends DataObject
'RelationFieldsTestPage' => 'RelationFieldsTestPage',
'GridFieldTestPageHasOne' => 'GridFieldTestPage'
);

private static $has_many = array(
'Employees' => 'SilverStripe\\FrameworkTest\\Model\\Employee',
'GroupPhotos' => 'SilverStripe\\Assets\\Image'
Expand Down Expand Up @@ -75,20 +67,17 @@ class Company extends DataObject
public function getCMSFields()
{
$fields = parent::getCMSFields();
$fields->addFieldToTab('Root.Main',
$uploadField = UploadField::create('GroupPhotos')
);
if (method_exists('SilverStripe\\Forms\\UploadField', 'setAllowedFileCategories')) {
$uploadField->setAllowedFileCategories('image');
}

$fields->addFieldToTab('Root.Main', $uploadField = UploadField::create('GroupPhotos'));
$uploadField->setAllowedFileCategories('image');
return $fields;
}

public function validate()
{
if (!$this->Title) {
return new ValidationResult(false, 'Title is required');
$result = new ValidationResult();
$result->addError('Title is required');
return $result;
} else {
return parent::validate();
}
Expand All @@ -98,15 +87,15 @@ public function DynamicProperty()
{
return sprintf('%s (%s)', $this->Name, $this->CEO);
}

public function requireDefaultRecords()
{
parent::requireDefaultRecords();
$companySet = DataObject::get('SilverStripe\\FrameworkTest\\Model\\Company');
$companySet = static::get();
foreach ($companySet as $company) {
$company->delete();
}

foreach ($this->data() as $companyData) {
$company = new Company();
$company->Name = $companyData[0];
Expand Down

0 comments on commit 813e75a

Please sign in to comment.