FIX Update API changes from beta1, implement namespaces in config

This commit is contained in:
Robbie Averill 2017-07-05 19:10:56 +12:00
parent 74ee84c3cd
commit a93d2fed75
4 changed files with 21 additions and 20 deletions

View File

@ -1,18 +1,18 @@
---
Name: translatable-extensions
---
SiteTree:
SilverStripe\CMS\Model\SiteTree:
extensions:
- 'Translatable'
SiteConfig:
- SilverStripe\Translatable\Model\Translatable
SilverStripe\SiteConfig\SiteConfig:
extensions:
- 'Translatable'
LeftAndMain:
- SilverStripe\Translatable\Model\Translatable
SilverStrip\Admin\LeftAndMain:
extensions:
- 'TranslatableCMSMainExtension'
HtmlEditorField_Toolbar:
- SilverStripe\Translatable\Controller\TranslatableCMSMainExtension
SilverStripe\Admin\ModelController:
extensions:
- 'TranslatableEditorToolbarExtension'
DataQuery:
- SilverStripe\Translatable\Controller\TranslatableEditorToolbarExtension
SilverStripe\ORM\DataQuery:
extensions:
- 'Translatable'
- SilverStripe\Translatable\Model\Translatable

View File

@ -683,14 +683,14 @@ class Translatable extends DataExtension implements PermissionProvider
}
$baseDataTable = DataObject::getSchema()->baseDataTable(get_class($this->owner));
$fields = array(
$fields = [
'OriginalID' => 'Int',
'TranslationGroupID' => 'Int',
);
$indexes = array(
'OriginalID' => true,
'TranslationGroupID' => true
);
];
$indexes = [
'OriginalID' => ['type' => 'index', 'columns' => ['OriginalID']],
'TranslationGroupID' => ['type' => 'index', 'columns' => ['TranslationGroupID']]
];
// Add new tables if required
DB::get_schema()->requireTable("{$baseDataTable}_translationgroups", $fields, $indexes);

View File

@ -44,12 +44,13 @@ class TranslatableSearchFormTest extends FunctionalTest
public static function setUpBeforeClass()
{
static::start();
// HACK Postgres doesn't refresh TSearch indexes when the schema changes after CREATE TABLE
// MySQL will need a different table type
self::kill_temp_db();
static::$tempDB->kill();
FulltextSearchable::enable();
self::create_temp_db();
self::resetDBSchema(true);
static::$tempDB->build();
static::resetDBSchema(true, true);
parent::setUpBeforeClass();
}

View File

@ -194,7 +194,7 @@ class TranslatableTest extends FunctionalTest
$translatedPage->copyVersionToStage('Stage', 'Live');
// Need to log out, otherwise pages redirect to CMS views
$this->session()->inst_set('loggedInAs', null);
$this->session()->set('loggedInAs', null);
$response = $this->get($origPage->URLSegment);
$this->assertEquals(200, $response->getStatusCode(), 'Page request without Locale GET param doesnt redirect');