Robbie Averill
eae155a228
Merge pull request #2239 from pine3ree/patch-3
...
simplify code using !empty
2018-08-18 09:28:15 +12:00
maks
599e198e89
simplify code using !empty
...
Hello @robbieaverill, please check my assumption...it's been a long time since I have last used SS (v3.2 was my last, if i remember correctly)
in the following lines 438:
```php
if (isset($this->templates[$action]) && $this->templates[$action]
|| (isset($this->templates['index']) && $this->templates['index'])
|| $this->template
) {
return parent::getViewer($action);
}
```
it looks like the 1st two (same-line) condition should be wrapped inside `()` while checking for a non-index action template .... if not just kill this PR at once. :-)
if the answer is yes then we can just use `!empty(...)` which is the same as 'isset(...) + truthy check'
kind regards,
maks
2018-08-17 14:51:36 +02:00
maks
75bc2da406
use identity operator + code consistency
...
- use identity operator === to check string
- use single quotes for consistency
- simplify code using the ternary operator
2018-08-17 14:38:24 +02:00
Maxime Rainville
d2f4ded3ef
🐛 Adjust deleteinstallfiles to use PUBLIC_PATH.
2018-05-31 10:12:08 +12:00
Robbie Averill
0f27e9696b
Merge branch '4.1' into 4
...
# Conflicts:
# .travis.yml
2018-05-28 18:22:07 +12:00
Robbie Averill
7479907333
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-05-28 18:20:46 +12:00
Daniel Hensby
a393de8d8d
Updating code style
2018-05-02 11:54:59 +01:00
Daniel Hensby
ed17eb2bd8
Revert "FIX Correct SilverStripeNavigator correctly in templates"
...
This reverts commit cf5a0984ad
2018-05-01 13:00:11 +01:00
Daniel Hensby
80a8e9033e
Move navigator casting to static
2018-05-01 12:59:53 +01:00
Damian Mooyman
8c11f83ed4
Merge remote-tracking branch 'origin/4.1' into 4
...
# Conflicts:
# .travis.yml
2018-04-13 10:25:28 +12:00
Damian Mooyman
61429c17a6
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# .travis.yml
2018-04-13 10:03:47 +12:00
Damian Mooyman
87d69ba753
ENHANCEMENT Use i18n template for page tree title
2018-04-10 10:30:49 +12:00
Jason Korth
e554e82afa
adjustment to show Page Type title on SiteTree mouseover
2018-04-09 21:52:07 +01:00
Damian Mooyman
48f53a522a
Merge remote-tracking branch 'origin/4.1' into 4
2018-04-05 08:38:24 +12:00
Damian Mooyman
c6af8856c8
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# code/Controllers/ContentController.php
2018-04-05 08:37:48 +12:00
Daniel Hensby
cf5a0984ad
FIX Correct SilverStripeNavigator correctly in templates
2018-03-22 14:40:14 +00:00
Damian Mooyman
354d72165e
Update CMS for versioned enhancements ( #2122 )
2018-03-14 16:34:46 +13:00
Daniel Hensby
d02c15150b
Merge branch '4.1' into 4
2018-02-21 14:02:52 +00:00
Daniel Hensby
47fdc4c589
Merge branch '4.0' into 4.1
2018-02-21 14:02:17 +00:00
Damian Mooyman
289d6a87a2
MINOR Simplify i18n keys
2018-02-21 10:32:13 +13:00
Robbie Averill
9ebea37b33
NEW Add extension point to CMSMain::Breadcrumbs
2018-02-20 14:28:25 +13:00
Damian Mooyman
3be0478e1c
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 11:03:23 +13:00
Daniel Hensby
9d77d32dea
Merge pull request #2099 from creative-commoners/pulls/4.0/dont-alias-this
...
MINOR Stop aliasing $this in history controller callbacks
2018-02-15 10:01:52 +00:00
Robbie Averill
e3a7a1ffed
MINOR Stop aliasing $this in history controller callbacks
2018-02-15 13:38:29 +13:00
Damian Mooyman
b291306c03
Merge remote-tracking branch 'origin/4.1' into 4
...
# Conflicts:
# client/dist/js/bundle.js
2018-02-15 09:24:08 +13:00
Chris Joe
a3873a6422
Merge pull request #2093 from open-sausages/pulls/4.1/mind-if-i-button
...
Replace save draft / save & publish buttons with save, publish
2018-02-12 10:47:14 +13:00
Aaron Carlino
ca8b728580
replace save draft / save & publish buttons with save, publish
2018-02-09 12:18:57 +13:00
Robbie Averill
b084fe8177
NEW Convert page history notice to use Bootstrap 4 info alert
2018-02-07 16:47:24 +13:00
Damian Mooyman
23a23043bc
Fix successfullyinstalled() ( #2069 )
...
Cleanup ContentController.php
2018-01-12 14:39:27 +13:00
Damian Mooyman
227ce39414
Merge branch '4.0' into 4
2017-12-18 16:16:20 +13:00
Damian Mooyman
210213a455
Fix search behaviour
2017-12-13 18:16:34 +13:00
Damian Mooyman
073cb77500
Trim some unnecessary API
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
8a04e9c46b
Fix wrong/confusing url segment
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
b391db4977
Fix search view
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
042dbbb13d
Remember pages view type
2017-12-13 17:10:39 +13:00
Damian Mooyman
c2d54a571d
Fix up code style, fix tests
...
Add in missing service definitions
2017-12-13 16:36:01 +13:00
Aaron Carlino
8ee5d9f5ce
ENHANCEMENT Cache canCreate
2017-12-13 16:26:36 +13:00
Loz Calver
7efe667a48
FIX: VirtualPage not using target page's template ( fixes #2039 ) ( #2041 )
...
* FIX: VirtualPage refreshFromCopied creates duplicate URLSegments on first write
* FIX: VirtualPage not using target page's template (fixes #2039 )
2017-12-06 11:59:30 +13:00
Lee Bradley
1fedc5fc10
API Make CMSMain::getSiteTreeFor() default to null nodeCount ( #2029 )
2017-11-28 10:09:27 +13:00
Lee Bradley
d3fa8946be
Issue-2034: Fix for Page icons using data urls
...
Fixes #2034
Code was getting the icon twice, both in SiteTree &
LeftAndMainPageIconsExtenstion.
Now just uses `SiteTree::getPageIconURL()`
Tweaked to use `sprintf` instead of double quotes
2017-11-23 15:42:31 +00:00
Robbie Averill
4d0632892b
FIX Add warning state to revert action in CMS page history
2017-10-27 17:32:00 +13:00
Damian Mooyman
7b71b2868e
Merge pull request #1999 from open-sausages/pulls/4.0/you-cannot-see-what-you-cannot-see
...
FIX revert to this button after archiving
2017-10-24 09:46:08 +13:00
Christopher Joe
689c198fbe
FIX revert to this button after archiving
2017-10-20 09:26:35 +13:00
Damian Mooyman
77b26b36fd
BUG Fix page icons in vendor modules
2017-10-19 15:41:12 +13:00
Damian Mooyman
c8f95182cb
Fix icon urls
2017-10-10 17:03:22 +13:00
Damian Mooyman
49fd3391fe
BUG Prevent icons CSS being included twice
2017-10-05 10:04:57 +13:00
Chris Joe
fb9ad4453e
Merge pull request #1973 from open-sausages/pulls/4.0/update-classinfo-usages
...
Update usages of ClassInfo
2017-09-20 16:29:37 +12:00
Damian Mooyman
fa0b559a7b
Update usages of ClassInfo
...
Add missing unit tests for SiteTreeFolderExtension
2017-09-20 15:20:17 +12:00
Damian Mooyman
496b9c8c04
API Implement insert-anchor modal
2017-09-20 13:35:25 +12:00
Robbie Averill
d18568c395
FIX Ensure client config merging includes existing parent "form" attributes
2017-09-15 09:12:53 +12:00
Saophalkun Ponlu
4f3b4f7626
FIX Fine-tune button styles
2017-09-13 10:44:11 +12:00
Damian Mooyman
4b26ed6a83
BUG Prevent treeview loading repeatedly on each page edit form
...
Fixes #1949
2017-09-05 11:52:04 +12:00
Damian Mooyman
1273059b4c
Fix campaign form validation errors
2017-09-04 14:47:45 +12:00
Damian Mooyman
9350b4a425
BUG Fix inconsistent breadcrumbs in CMS section
...
Fixes #1867
2017-08-28 13:03:56 +12:00
Saophalkun Ponlu
d0fd96d4e6
FIX Remove entry points to tree in search mode
2017-08-28 11:00:41 +12:00
Andrew Aitken-Fincham
46abf8ffd5
sanitize namespaced classes for page icon css
2017-08-24 12:00:33 +01:00
Saophalkun Ponlu
d03edb208e
FIX Search in page edit should now redirect to (full) table view
2017-08-24 13:50:05 +12:00
Loz Calver
9a9b4e205c
Merge pull request #1929 from robbieaverill/pulls/4.0/replace-stat-usage
...
Replace use of Configurable stat() with config()->get(), will be deprecated in future
2017-08-23 10:26:45 +01:00
Robbie Averill
f2e22ef18a
Replace use of Configurable stat() with config()->get(), will be deprecated in future
2017-08-23 09:46:46 +12:00
Damian Mooyman
e078e6623d
Restore deferred cms tree loading
2017-08-21 13:59:26 +12:00
Robbie Averill
fc0362087e
FIX Remove legacy sprintf style translations in favour of placeholders
2017-08-02 13:42:52 +12:00
Robbie Averill
f8ea7f27cf
Remove sprintf translations in CMSMain in favour of named parameters
2017-08-02 13:40:08 +12:00
Daniel Hensby
0758f66932
Merge branch '3' into 4
2017-07-25 14:54:33 +01:00
Damian Mooyman
b0380d8766
Un-hard code ViewState argument
2017-07-25 12:57:46 +12:00
Saophalkun Ponlu
fca3ba73f5
FIX Pages search now defaults to list view
2017-07-25 12:57:46 +12:00
Aaron Carlino
fbb63e68e1
Remove whitespace
2017-07-21 10:10:53 +12:00
Aaron Carlino
cc6b44223e
BUGFIX: ContentController still using global $project;
2017-07-21 09:56:41 +12:00
Robbie Averill
fb6e6162ca
FIX Use better inheritance based logic for deciding which active tab to display in edit page
2017-07-18 13:19:04 +12:00
Robbie Averill
dd4d5740b8
FIX Ensure tab states are reflected when switching on page edit screen
2017-07-16 22:46:11 +12:00
Daniel Hensby
732bdd2734
Merge branch '3' into 4
2017-07-15 16:21:51 +01:00
Robbie Averill
1cf8a67f21
NEW Use injector for creating SSViewer
2017-07-13 21:20:00 +12:00
Sam Minnee
ce730319ec
NEW: Remove use of MODULE_DIR constants
...
This relies on
https://github.com/silverstripe/silverstripe-framework/pull/7065
2017-06-28 16:34:05 +12:00
Damian Mooyman
2251138bed
Merge pull request #1862 from robbieaverill/pulls/4.0/fix-missing-memberauthenticator
...
FIX Ensure LoginForm on ContentController can load the member authenticator correctly
2017-06-28 12:10:28 +12:00
Jonathon Menz
77ec2b90c6
API Removed ErrorPage
...
Removed ErrorPage class and references so it can be split off in to a separate module. Please install https://github.com/silverstripe/silverstripe-errorpage when upgrading to SS4 to preserve ErrorPage functionality. Closes https://github.com/silverstripe/silverstripe-framework/issues/4149
2017-06-26 10:01:54 -07:00
Robbie Averill
8d23cfc2aa
FIX Ensure LoginForm on ContentController can load the member authenticator correctly
2017-06-23 11:22:01 +12:00
Damian Mooyman
c2c75aa9e3
Fix and upgrade all tests
...
Fix link tracking
2017-06-21 16:29:40 +12:00
Damian Mooyman
95e304a4ca
Upgrade usage of global methods
2017-06-20 17:12:18 +12:00
Damian Mooyman
21e204cc59
App object refactor
2017-06-20 17:12:18 +12:00
Antony Thorpe
fdbe38d444
Bugfix: SS4 Right click, add page fails
...
`addForm` receives both POSTs and GETs. Set the form's `strictFormMethodCheck` to false to avoid `405 Method Not Allowed` error response. Issue #1846 .
2017-06-15 13:53:38 +12:00
Simon Erkelens
b2fd014216
Make CMS Compatible with Authentication Refactor work
...
Move Member::currentUser() to Security::getCurrentUser()
2017-06-09 21:07:20 +12:00
Damian Mooyman
f82f0844c1
API Add insert internal link modal
2017-05-30 11:00:32 +12:00
Damian Mooyman
23e1aa8c45
API Refactor inherited permissions ( #1811 )
2017-05-12 12:47:46 +12:00
Damian Mooyman
1efb325b4d
Merge pull request #1813 from open-sausages/pulls/4.0/remove-deprecated-methods
...
Remove APIs with target deprecation of 4.0
2017-05-09 11:36:49 +12:00
Ingo Schommer
4923a2597b
Replaced usage of ResetFormAction ( #1812 )
...
See https://github.com/silverstripe/silverstripe-framework/pull/6883
2017-05-09 11:11:08 +12:00
Ingo Schommer
484a4ec4f6
API Removed deprecated RootURLController:set_default_homepage_link
2017-05-08 21:17:36 +12:00
Ingo Schommer
de41e14518
API Removed deprecated ModelAsController::find_old_page()
2017-05-08 21:14:38 +12:00
Aaron Carlino
359179025d
Reorganise i18n keys
2017-05-08 17:57:24 +12:00
Uncle Cheese
29805ee446
New namespaced i18n keys
2017-04-27 11:43:04 +12:00
Uncle Cheese
6fb1012eb8
Ran upgrader for lang files
2017-04-27 11:43:04 +12:00
Ingo Schommer
cf2b0417cb
Fix coding conventions
2017-04-22 11:44:49 +12:00
Damian Mooyman
d75a3cb0e9
API Update site tree hierarchy to use a MarkingSet and template
2017-04-12 08:57:09 +12:00
Ingo Schommer
9cad8ba01b
Fixed linting
2017-04-12 08:21:02 +12:00
Damian Mooyman
b1b0c6af63
BUG Ensure all CMS forms include full ID / VersionID in path
...
Fixes #1510
Refactor tree operations into CMSMain
Cleanup CMSMain and subclasses
2017-04-06 13:40:46 +12:00
Saophalkun Ponlu
b8db45055c
Enhancement Refactor archive message to a separate method
2017-04-05 12:45:41 +12:00
Saophalkun Ponlu
5b90141c03
ENHANCEMENT Update archive warning message
2017-04-04 11:26:46 +12:00
Damian Mooyman
393d392de1
Merge pull request #1775 from open-sausages/pulls/4.0/6626-remove-jquery-datepicker
...
HTML5 Date and Time Fields
2017-04-04 10:57:16 +12:00
Ingo Schommer
d07115e665
Use new DateField->setHTML5()
...
See https://github.com/silverstripe/silverstripe-framework/issues/6626
2017-04-03 12:01:12 +12:00
Damian Mooyman
98e77a48a9
API Rename SiteTree::description() to SiteTree::classDescription() to prevent clash
...
Fixes #1733
2017-03-29 11:55:44 +13:00
Damian Mooyman
91933b6c66
Update class namespace
2017-03-28 14:01:02 +13:00
Damian Mooyman
5ce98aced2
API Upgrade to rely on silverstripe/versioned module
2017-03-28 10:35:14 +13:00
