Skip to content

Commit af7d16f

Browse files
michaellindahltabacitu
authored andcommitted
Update routes and editor links to follow the route_prefix (#184)
1 parent 3ab718d commit af7d16f

File tree

8 files changed

+17
-11
lines changed

8 files changed

+17
-11
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ All Notable changes to `Backpack CRUD` will be documented in this file
2020
- Nothing
2121

2222

23-
## [3.1.27] - 2016-10-x
23+
## [3.1.28] - 2016-10-15
24+
25+
### Fixed
26+
- Update routes and editor links to follow the route_prefix set in config;
27+
28+
29+
## [3.1.27] - 2016-10-7
2430

2531
### Fixed
2632
- 'table' field is properly encapsulated now;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ $ php artisan vendor:publish --provider="Backpack\CRUD\CrudServiceProvider" --ta
6161

6262
6) [Optional] You can now the file manager to the menu, in `resources/views/vendor/backpack/base/inc/sidebar.blade.php` or `menu.blade.php`:
6363
```html
64-
<li><a href="{{ url('admin/elfinder') }}"><i class="fa fa-files-o"></i> <span>File manager</span></a></li>
64+
<li><a href="{{ url(config('backpack.base.route_prefix').'/elfinder') }}"><i class="fa fa-files-o"></i> <span>File manager</span></a></li>
6565
```
6666

6767
## Usage

src/CrudPanel.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ public function setRouteName($route, $parameters = [])
127127
* Get the current CrudController route.
128128
*
129129
* Can be defined in the CrudController with:
130-
* - $this->crud->setRoute('admin/article')
131-
* - $this->crud->setRouteName('admin.article')
132-
* - $this->crud->route = "admin/article"
130+
* - $this->crud->setRoute(config('backpack.base.route_prefix').'/article')
131+
* - $this->crud->setRouteName(config('backpack.base.route_prefix').'.article')
132+
* - $this->crud->route = config('backpack.base.route_prefix')."/article"
133133
*
134134
* @return [string]
135135
*/

src/config/elfinder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*/
4040

4141
'route' => [
42-
'prefix' => 'admin/elfinder',
42+
'prefix' => config('backpack.base.route_prefix').'/elfinder',
4343
'middleware' => ['web', 'auth'], //Set to null to disable middleware filter
4444
],
4545

src/resources/views/fields/ckeditor.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<script>
3131
jQuery(document).ready(function($) {
3232
$('textarea.ckeditor' ).ckeditor({
33-
"filebrowserBrowseUrl": "{{ url('admin/elfinder/ckeditor') }}",
33+
"filebrowserBrowseUrl": "{{ url(config('backpack.base.route_prefix').'/elfinder/ckeditor') }}",
3434
"extraPlugins" : 'oembed,widget'
3535
});
3636
});

src/resources/views/fields/page_or_link.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class="form-control"
5858
type="text"
5959
class="form-control"
6060
name="link"
61-
placeholder="{{ trans('backpack::crud.internal_link_placeholder', ['url', url('admin/page')]) }}"
61+
placeholder="{{ trans('backpack::crud.internal_link_placeholder', ['url', url(config('backpack.base.route_prefix').'/page')]) }}"
6262

6363
@if (!isset($entry) || $entry->type!='internal_link')
6464
disabled="disabled"

src/resources/views/fields/tinymce.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@push('crud_fields_scripts')
2828
<!-- include tinymce js-->
2929
<script src="{{ asset('vendor/backpack/tinymce/tinymce.min.js') }}"></script>
30-
{{-- <script src="{{ asset('admin/js/vendor/tinymce/jquery.tinymce.min.js') }}"></script> --}}
30+
{{-- <script src="{{ asset(config('backpack.base.route_prefix').'/js/vendor/tinymce/jquery.tinymce.min.js') }}"></script> --}}
3131

3232
<script type="text/javascript">
3333
tinymce.init({
@@ -39,7 +39,7 @@
3939
4040
function elFinderBrowser (field_name, url, type, win) {
4141
tinymce.activeEditor.windowManager.open({
42-
file: '{{ url('admin/elfinder/tinymce4') }}',// use an absolute path!
42+
file: '{{ url(config('backpack.base.route_prefix').'/elfinder/tinymce4') }}',// use an absolute path!
4343
title: 'elFinder 2.0',
4444
width: 900,
4545
height: 450,

src/resources/views/fields/wysiwyg.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<script>
3131
jQuery(document).ready(function($) {
3232
$('textarea.ckeditor' ).ckeditor({
33-
"filebrowserBrowseUrl": "{{ url('admin/elfinder/ckeditor') }}",
33+
"filebrowserBrowseUrl": "{{ url(config('backpack.base.route_prefix').'/elfinder/ckeditor') }}",
3434
"extraPlugins" : 'oembed,widget'
3535
});
3636
});

0 commit comments

Comments
 (0)