tonyair
/
silverstripe-contentreview
mirror of https://github.com/silverstripe/silverstripe-contentreview
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.0'

This commit is contained in:
Robbie Averill 2017-08-24 12:58:51 +12:00
parent ed7f5fc4de 4f7e57d29c
commit 42718f3f86
4 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -1,4 +1,4 @@
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details # See https://github.com/silverstripe/silverstripe-travis-support for setup details
sudo: false sudo: false
@ -8,11 +8,9 @@ php:
- 5.3 - 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6
- 7.0
env: env:
- DB=MYSQL CORE_RELEASE=3.2 - DB=MYSQL CORE_RELEASE=3.5
matrix: matrix:
include: include:
@ -22,12 +20,12 @@ matrix:
env: DB=MYSQL CORE_RELEASE=3.1 env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.6 - php: 5.6
env: DB=PGSQL CORE_RELEASE=3.2 env: DB=PGSQL CORE_RELEASE=3.2
allow_failures: - php: 7.1
- php: 7.0 env: DB=MYSQL CORE_RELEASE=3.6
before_script: before_script:
- composer self-update || true - composer self-update || true
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss - cd ~/builds/ss
- composer install - composer install

4
code/extensions/SiteTreeContentReview.php
View File

@ -458,6 +458,10 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider
return false; return false;
} }
if (!$options || !$options->hasExtension($this->class)) {
return false;
}
if ($options->OwnerGroups()->count() == 0 && $options->OwnerUsers()->count() == 0) { if ($options->OwnerGroups()->count() == 0 && $options->OwnerUsers()->count() == 0) {
return false; return false;
} }

54
composer.json
View File

@ -1,31 +1,31 @@
{ {
"name": "silverstripe/contentreview", "name": "silverstripe/contentreview",
"type": "silverstripe-module", "type": "silverstripe-module",
"description": "Flags pages for periodical author review (incl. reporting)", "description": "Flags pages for periodical author review (incl. reporting)",
"homepage": "http://silverstripe.org", "homepage": "http://silverstripe.org",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"keywords": ["silverstripe", "cms", "workflow"], "keywords": [
"authors": [ "silverstripe",
{ "cms",
"name": "SilverStripe", "workflow"
"homepage": "http://silverstripe.com" ],
}, "authors": [
{ {
"name": "The SilverStripe Community", "name": "SilverStripe",
"homepage": "http://silverstripe.org" "homepage": "http://silverstripe.com"
} },
], {
"require": { "name": "The SilverStripe Community",
"composer/installers": "*", "homepage": "http://silverstripe.org"
"silverstripe/framework": "~3.1", }
"silverstripe/cms": "~3.1" ],
}, "require": {
"suggests": { "composer/installers": "*",
"silverstripe/framework": "~3.1",
"silverstripe/cms": "~3.1"
},
"suggest": {
"silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created" "silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created"
}, },
"extra": { "extra": []
"branch-alias": {
"dev-master": "3.0.x-dev"
}
}
} }

6
tests/ContentReviewCMSPageEditControllerTest.php
View File

@ -67,7 +67,7 @@ class ContentReviewCMSPageEditControllerTest extends ContentReviewBaseTest
); );
$this->get('admin/pages/edit/show/' . $page->ID); $this->get('admin/pages/edit/show/' . $page->ID);
$response = $this->post("admin/pages/edit/EditForm", $data); $response = $this->post(singleton('CMSPageEditController')->getEditForm($page->ID)->FormAction(), $data);
$this->assertEquals("OK", $response->getStatusDescription()); $this->assertEquals("OK", $response->getStatusDescription());
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode());
@ -90,8 +90,8 @@ class ContentReviewCMSPageEditControllerTest extends ContentReviewBaseTest
); );
$this->get('admin/pages/edit/show/' . $page->ID); $this->get('admin/pages/edit/show/' . $page->ID);
$response = $this->post("admin/pages/edit/EditForm", $data); $response = $this->post(singleton('CMSPageEditController')->getEditForm($page->ID)->FormAction(), $data);
$this->assertEquals("OK", $response->getStatusDescription()); $this->assertEquals("OK", $response->getStatusDescription());
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode());
$this->assertEquals(1, $page->ReviewLogs()->count()); $this->assertEquals(1, $page->ReviewLogs()->count());