@@ -2,115 +2,115 @@ |
||
2 | 2 | |
3 | 3 | class SlideImageTest extends FlexSliderTest |
4 | 4 | { |
5 | - protected static $use_draft_site = true; |
|
5 | + protected static $use_draft_site = true; |
|
6 | 6 | |
7 | - public function setUp() |
|
8 | - { |
|
9 | - parent::setUp(); |
|
10 | - } |
|
7 | + public function setUp() |
|
8 | + { |
|
9 | + parent::setUp(); |
|
10 | + } |
|
11 | 11 | |
12 | - public function testGetCMSFields() |
|
13 | - { |
|
14 | - $object = new SlideImage(); |
|
15 | - $fieldset = $object->getCMSFields(); |
|
16 | - $this->assertTrue(is_a($fieldset, 'FieldList')); |
|
17 | - $this->assertNotNull($fieldset->dataFieldByName('Name')); |
|
18 | - $this->assertNotNull($fieldset->dataFieldByName('Image')); |
|
19 | - } |
|
12 | + public function testGetCMSFields() |
|
13 | + { |
|
14 | + $object = new SlideImage(); |
|
15 | + $fieldset = $object->getCMSFields(); |
|
16 | + $this->assertTrue(is_a($fieldset, 'FieldList')); |
|
17 | + $this->assertNotNull($fieldset->dataFieldByName('Name')); |
|
18 | + $this->assertNotNull($fieldset->dataFieldByName('Image')); |
|
19 | + } |
|
20 | 20 | |
21 | - public function testValidateName() |
|
22 | - { |
|
23 | - $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
24 | - $object->Name = ''; |
|
25 | - $this->setExpectedException('ValidationException'); |
|
26 | - $object->write(); |
|
27 | - } |
|
21 | + public function testValidateName() |
|
22 | + { |
|
23 | + $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
24 | + $object->Name = ''; |
|
25 | + $this->setExpectedException('ValidationException'); |
|
26 | + $object->write(); |
|
27 | + } |
|
28 | 28 | |
29 | - public function testValidateImage() |
|
30 | - { |
|
31 | - $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
32 | - $object->ImageID = ''; |
|
33 | - $this->setExpectedException('ValidationException'); |
|
34 | - $object->write(); |
|
35 | - } |
|
29 | + public function testValidateImage() |
|
30 | + { |
|
31 | + $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
32 | + $object->ImageID = ''; |
|
33 | + $this->setExpectedException('ValidationException'); |
|
34 | + $object->write(); |
|
35 | + } |
|
36 | 36 | |
37 | - public function testCanView() |
|
38 | - { |
|
39 | - $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
40 | - $image = $this->objFromFixture('Image', 'image1'); |
|
41 | - $object->ImageID = $image->ID; |
|
42 | - $object->write(); |
|
43 | - $this->logInWithPermission('ADMIN'); |
|
44 | - $this->assertTrue($object->canView()); |
|
45 | - $this->logOut(); |
|
46 | - $nullMember = Member::create(); |
|
47 | - $nullMember->write(); |
|
48 | - $this->assertTrue($object->canView($nullMember)); |
|
49 | - $nullMember->delete(); |
|
50 | - } |
|
37 | + public function testCanView() |
|
38 | + { |
|
39 | + $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
40 | + $image = $this->objFromFixture('Image', 'image1'); |
|
41 | + $object->ImageID = $image->ID; |
|
42 | + $object->write(); |
|
43 | + $this->logInWithPermission('ADMIN'); |
|
44 | + $this->assertTrue($object->canView()); |
|
45 | + $this->logOut(); |
|
46 | + $nullMember = Member::create(); |
|
47 | + $nullMember->write(); |
|
48 | + $this->assertTrue($object->canView($nullMember)); |
|
49 | + $nullMember->delete(); |
|
50 | + } |
|
51 | 51 | |
52 | - public function testCanEdit() |
|
53 | - { |
|
54 | - $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
55 | - $image = $this->objFromFixture('Image', 'image1'); |
|
56 | - $object->ImageID = $image->ID; |
|
57 | - $object->write(); |
|
58 | - $objectID = $object->ID; |
|
59 | - $this->logInWithPermission('ADMIN'); |
|
60 | - $originalName = $object->Name; |
|
61 | - $this->assertEquals($originalName, 'Hello World'); |
|
62 | - $this->assertTrue($object->canEdit()); |
|
63 | - $object->Name = 'Changed Name'; |
|
64 | - $object->write(); |
|
65 | - $testEdit = SlideImage::get()->byID($objectID); |
|
66 | - $this->assertEquals($testEdit->Name, 'Changed Name'); |
|
67 | - $this->logOut(); |
|
68 | - } |
|
52 | + public function testCanEdit() |
|
53 | + { |
|
54 | + $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
55 | + $image = $this->objFromFixture('Image', 'image1'); |
|
56 | + $object->ImageID = $image->ID; |
|
57 | + $object->write(); |
|
58 | + $objectID = $object->ID; |
|
59 | + $this->logInWithPermission('ADMIN'); |
|
60 | + $originalName = $object->Name; |
|
61 | + $this->assertEquals($originalName, 'Hello World'); |
|
62 | + $this->assertTrue($object->canEdit()); |
|
63 | + $object->Name = 'Changed Name'; |
|
64 | + $object->write(); |
|
65 | + $testEdit = SlideImage::get()->byID($objectID); |
|
66 | + $this->assertEquals($testEdit->Name, 'Changed Name'); |
|
67 | + $this->logOut(); |
|
68 | + } |
|
69 | 69 | |
70 | - public function testCanDelete() |
|
71 | - { |
|
72 | - $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
73 | - $image = $this->objFromFixture('Image', 'image1'); |
|
74 | - $object->ImageID = $image->ID; |
|
75 | - $object->write(); |
|
76 | - $this->logInWithPermission('ADMIN'); |
|
77 | - $this->assertTrue($object->canDelete()); |
|
78 | - $checkObject = $object; |
|
79 | - $object->delete(); |
|
80 | - $this->assertEquals($checkObject->ID, 0); |
|
81 | - } |
|
70 | + public function testCanDelete() |
|
71 | + { |
|
72 | + $object = $this->objFromFixture('SlideImage', 'slide1'); |
|
73 | + $image = $this->objFromFixture('Image', 'image1'); |
|
74 | + $object->ImageID = $image->ID; |
|
75 | + $object->write(); |
|
76 | + $this->logInWithPermission('ADMIN'); |
|
77 | + $this->assertTrue($object->canDelete()); |
|
78 | + $checkObject = $object; |
|
79 | + $object->delete(); |
|
80 | + $this->assertEquals($checkObject->ID, 0); |
|
81 | + } |
|
82 | 82 | |
83 | - public function testCanCreate() |
|
84 | - { |
|
85 | - $object = singleton('SlideImage'); |
|
86 | - $this->logInWithPermission('ADMIN'); |
|
87 | - $this->assertTrue($object->canCreate()); |
|
88 | - $this->logOut(); |
|
89 | - $nullMember = Member::create(); |
|
90 | - $nullMember->write(); |
|
91 | - $this->assertFalse($object->canCreate($nullMember)); |
|
92 | - $nullMember->delete(); |
|
93 | - } |
|
83 | + public function testCanCreate() |
|
84 | + { |
|
85 | + $object = singleton('SlideImage'); |
|
86 | + $this->logInWithPermission('ADMIN'); |
|
87 | + $this->assertTrue($object->canCreate()); |
|
88 | + $this->logOut(); |
|
89 | + $nullMember = Member::create(); |
|
90 | + $nullMember->write(); |
|
91 | + $this->assertFalse($object->canCreate($nullMember)); |
|
92 | + $nullMember->delete(); |
|
93 | + } |
|
94 | 94 | |
95 | - public function testProvidePermissions() |
|
96 | - { |
|
97 | - $object = singleton('SlideImage'); |
|
98 | - $expected = array( |
|
99 | - 'Slide_EDIT' => 'Slide Edit', |
|
100 | - 'Slide_DELETE' => 'Slide Delete', |
|
101 | - 'Slide_CREATE' => 'Slide Create', |
|
102 | - ); |
|
103 | - $this->assertEquals($expected, $object->providePermissions()); |
|
104 | - } |
|
95 | + public function testProvidePermissions() |
|
96 | + { |
|
97 | + $object = singleton('SlideImage'); |
|
98 | + $expected = array( |
|
99 | + 'Slide_EDIT' => 'Slide Edit', |
|
100 | + 'Slide_DELETE' => 'Slide Delete', |
|
101 | + 'Slide_CREATE' => 'Slide Create', |
|
102 | + ); |
|
103 | + $this->assertEquals($expected, $object->providePermissions()); |
|
104 | + } |
|
105 | 105 | |
106 | - public function testImageFileSizeLimit() |
|
107 | - { |
|
106 | + public function testImageFileSizeLimit() |
|
107 | + { |
|
108 | 108 | |
109 | - $this->assertEquals(Config::inst()->get('SlideImage', 'flexslider_max_image_size'), 512000); |
|
109 | + $this->assertEquals(Config::inst()->get('SlideImage', 'flexslider_max_image_size'), 512000); |
|
110 | 110 | |
111 | - Config::inst()->update('SlideImage', 'flexslider_max_image_size', 1024000); |
|
111 | + Config::inst()->update('SlideImage', 'flexslider_max_image_size', 1024000); |
|
112 | 112 | |
113 | - $this->assertEquals(Config::inst()->get('SlideImage', 'flexslider_max_image_size'), 1024000); |
|
113 | + $this->assertEquals(Config::inst()->get('SlideImage', 'flexslider_max_image_size'), 1024000); |
|
114 | 114 | |
115 | - } |
|
115 | + } |
|
116 | 116 | } |
@@ -6,117 +6,117 @@ |
||
6 | 6 | class SlideImage extends DataObject implements PermissionProvider |
7 | 7 | { |
8 | 8 | |
9 | - /** |
|
10 | - * @var int |
|
11 | - */ |
|
12 | - private static $flexslider_max_image_size = 512000; |
|
13 | - |
|
14 | - /** |
|
15 | - * @var array |
|
16 | - */ |
|
17 | - private static $defaults = array( |
|
18 | - 'ShowSlide' => true, |
|
19 | - ); |
|
20 | - |
|
21 | - /** |
|
22 | - * @return FieldList |
|
23 | - */ |
|
24 | - public function getCMSFields() |
|
25 | - { |
|
26 | - $fields = parent::getCMSFields(); |
|
27 | - $ImageField = ImageUploadField::create('Image') |
|
28 | - ->setTitle('Image') |
|
29 | - ->setFolderName('Uploads/SlideImages'); |
|
30 | - $ImageField->getValidator()->setAllowedMaxFileSize($this->config()->get('flexslider_max_image_size')); |
|
31 | - |
|
32 | - $fields->removeByName(array('ShowSlide')); |
|
33 | - |
|
34 | - $fields->addFieldsToTab('Root.Main', array( |
|
35 | - TextField::create('Name') |
|
36 | - ->setDescription('for internal reference only'), |
|
37 | - TextField::create('Headline') |
|
38 | - ->setDescription('optional, used in template'), |
|
39 | - TextareaField::create('Description') |
|
40 | - ->setDescription('optional, used in template'), |
|
41 | - TreeDropdownField::create('PageLinkID', 'Choose a page to link to:', 'SiteTree'), |
|
42 | - $ImageField, |
|
43 | - CheckboxField::create('ShowSlide')->setTitle('Show Slide') |
|
44 | - ->setDescription('Include this slide in the slider. Uncheck to hide'), |
|
45 | - )); |
|
46 | - $fields->removeByName(array( |
|
47 | - 'SortOrder', |
|
48 | - 'PageID', |
|
49 | - )); |
|
50 | - |
|
51 | - $this->extend('updateCMSFields', $fields); |
|
52 | - |
|
53 | - return $fields; |
|
54 | - } |
|
55 | - |
|
56 | - /** |
|
57 | - * @return ValidationResult |
|
58 | - */ |
|
59 | - public function validate() |
|
60 | - { |
|
61 | - $result = parent::validate(); |
|
62 | - |
|
63 | - if (!$this->Name) { |
|
64 | - $result->error('A Name is required before you can save'); |
|
65 | - } |
|
66 | - |
|
67 | - if (!$this->ImageID) { |
|
68 | - $result->error('An Image is required before you can save'); |
|
69 | - } |
|
70 | - |
|
71 | - return $result; |
|
72 | - } |
|
73 | - |
|
74 | - /** |
|
75 | - * @return array |
|
76 | - */ |
|
77 | - public function providePermissions() |
|
78 | - { |
|
79 | - return array( |
|
80 | - 'Slide_EDIT' => 'Slide Edit', |
|
81 | - 'Slide_DELETE' => 'Slide Delete', |
|
82 | - 'Slide_CREATE' => 'Slide Create', |
|
83 | - ); |
|
84 | - } |
|
85 | - |
|
86 | - /** |
|
87 | - * @param null $member |
|
88 | - * @return bool|int |
|
89 | - */ |
|
90 | - public function canCreate($member = null) |
|
91 | - { |
|
92 | - return Permission::check('Slide_CREATE'); |
|
93 | - } |
|
94 | - |
|
95 | - /** |
|
96 | - * @param null $member |
|
97 | - * @return bool|int |
|
98 | - */ |
|
99 | - public function canEdit($member = null) |
|
100 | - { |
|
101 | - return Permission::check('Slide_EDIT'); |
|
102 | - } |
|
103 | - |
|
104 | - /** |
|
105 | - * @param null $member |
|
106 | - * @return bool|int |
|
107 | - */ |
|
108 | - public function canDelete($member = null) |
|
109 | - { |
|
110 | - return Permission::check('Slide_DELETE'); |
|
111 | - } |
|
112 | - |
|
113 | - /** |
|
114 | - * @param null $member |
|
115 | - * @return bool |
|
116 | - */ |
|
117 | - public function canView($member = null) |
|
118 | - { |
|
119 | - return true; |
|
120 | - } |
|
9 | + /** |
|
10 | + * @var int |
|
11 | + */ |
|
12 | + private static $flexslider_max_image_size = 512000; |
|
13 | + |
|
14 | + /** |
|
15 | + * @var array |
|
16 | + */ |
|
17 | + private static $defaults = array( |
|
18 | + 'ShowSlide' => true, |
|
19 | + ); |
|
20 | + |
|
21 | + /** |
|
22 | + * @return FieldList |
|
23 | + */ |
|
24 | + public function getCMSFields() |
|
25 | + { |
|
26 | + $fields = parent::getCMSFields(); |
|
27 | + $ImageField = ImageUploadField::create('Image') |
|
28 | + ->setTitle('Image') |
|
29 | + ->setFolderName('Uploads/SlideImages'); |
|
30 | + $ImageField->getValidator()->setAllowedMaxFileSize($this->config()->get('flexslider_max_image_size')); |
|
31 | + |
|
32 | + $fields->removeByName(array('ShowSlide')); |
|
33 | + |
|
34 | + $fields->addFieldsToTab('Root.Main', array( |
|
35 | + TextField::create('Name') |
|
36 | + ->setDescription('for internal reference only'), |
|
37 | + TextField::create('Headline') |
|
38 | + ->setDescription('optional, used in template'), |
|
39 | + TextareaField::create('Description') |
|
40 | + ->setDescription('optional, used in template'), |
|
41 | + TreeDropdownField::create('PageLinkID', 'Choose a page to link to:', 'SiteTree'), |
|
42 | + $ImageField, |
|
43 | + CheckboxField::create('ShowSlide')->setTitle('Show Slide') |
|
44 | + ->setDescription('Include this slide in the slider. Uncheck to hide'), |
|
45 | + )); |
|
46 | + $fields->removeByName(array( |
|
47 | + 'SortOrder', |
|
48 | + 'PageID', |
|
49 | + )); |
|
50 | + |
|
51 | + $this->extend('updateCMSFields', $fields); |
|
52 | + |
|
53 | + return $fields; |
|
54 | + } |
|
55 | + |
|
56 | + /** |
|
57 | + * @return ValidationResult |
|
58 | + */ |
|
59 | + public function validate() |
|
60 | + { |
|
61 | + $result = parent::validate(); |
|
62 | + |
|
63 | + if (!$this->Name) { |
|
64 | + $result->error('A Name is required before you can save'); |
|
65 | + } |
|
66 | + |
|
67 | + if (!$this->ImageID) { |
|
68 | + $result->error('An Image is required before you can save'); |
|
69 | + } |
|
70 | + |
|
71 | + return $result; |
|
72 | + } |
|
73 | + |
|
74 | + /** |
|
75 | + * @return array |
|
76 | + */ |
|
77 | + public function providePermissions() |
|
78 | + { |
|
79 | + return array( |
|
80 | + 'Slide_EDIT' => 'Slide Edit', |
|
81 | + 'Slide_DELETE' => 'Slide Delete', |
|
82 | + 'Slide_CREATE' => 'Slide Create', |
|
83 | + ); |
|
84 | + } |
|
85 | + |
|
86 | + /** |
|
87 | + * @param null $member |
|
88 | + * @return bool|int |
|
89 | + */ |
|
90 | + public function canCreate($member = null) |
|
91 | + { |
|
92 | + return Permission::check('Slide_CREATE'); |
|
93 | + } |
|
94 | + |
|
95 | + /** |
|
96 | + * @param null $member |
|
97 | + * @return bool|int |
|
98 | + */ |
|
99 | + public function canEdit($member = null) |
|
100 | + { |
|
101 | + return Permission::check('Slide_EDIT'); |
|
102 | + } |
|
103 | + |
|
104 | + /** |
|
105 | + * @param null $member |
|
106 | + * @return bool|int |
|
107 | + */ |
|
108 | + public function canDelete($member = null) |
|
109 | + { |
|
110 | + return Permission::check('Slide_DELETE'); |
|
111 | + } |
|
112 | + |
|
113 | + /** |
|
114 | + * @param null $member |
|
115 | + * @return bool |
|
116 | + */ |
|
117 | + public function canView($member = null) |
|
118 | + { |
|
119 | + return true; |
|
120 | + } |
|
121 | 121 | |
122 | 122 | } |