8000 fix with url_prefix config · abcdmitry/laravel-filemanager@f5013fe · GitHub
[go: up one dir, main page]
Skip to content

Commit f5013fe

Browse files
streamtwstreamtw
committed
fix with url_prefix config
1 parent 225f741 commit f5013fe

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

‎docs/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
|--------------------|---------|--------------------------------------------------------------------------------------------------------------|
77
| use\_package\_routes | boolean | Use routes from package or not. If false, you will need to define routes to all controllers of this package. |
88
| middlewares | array | Middlewares to be applied to default routes. For laravel 5.1 and before, remove 'web' from the array. |
9-
| prefix | string | The url prefix to this package. Change it if necessary. |
9+
| url_prefix | string | The url prefix to this package. Change it if necessary. |
1010

1111

1212
## Multi-User Mode:

‎src/config/lfm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
'middlewares' => ['web', 'auth'],
1616

1717
// The url to this package. Change it if necessary.
18-
'prefix' => 'laravel-filemanager',
18+
'url_prefix' => 'laravel-filemanager',
1919

2020
/*
2121
|--------------------------------------------------------------------------

‎src/controllers/RedirectController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class RedirectController extends LfmController
1515

1616
public function __construct()
1717
{
18-
$delimiter = config('lfm.prefix') . '/';
18+
$delimiter = config('lfm.url_prefix') . '/';
1919
$url = urldecode(request()->url());
2020
// dd($delimiter);
2121
$external_path = substr($url, strpos($url, $delimiter) + strlen($delimiter));

‎src/routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'\Unisharp\Laravelfilemanager\middlewares\MultiUser',
55
'\Unisharp\Laravelfilemanager\middlewares\CreateDefaultFolder',
66
]);
7-
$prefix = \Config::get('lfm.prefix', 'laravel-filemanager');
7+
$prefix = \Config::get('lfm.url_prefix', 'laravel-filemanager');
88
$as = 'unisharp.lfm.';
99
$namespace = '\Unisharp\Laravelfilemanager\controllers';
1010

‎src/traits/LfmHelpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function getPathPrefix($type)
110110
}
111111

112112
if ($type === 'url' && $base_directory !== 'public') {
113-
$prefix = config('lfm.urls_prefix', 'laravel-filemanager') . '/' . $prefix;
113+
$prefix = config('lfm.url_prefix', 'laravel-filemanager') . '/' . $prefix;
114114
}
115115

116116
return $prefix;

‎src/views/demo.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
4444
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
4545
<script>
46-
var route_prefix = "{{ url(config('lfm.prefix')) }}";
46+
var route_prefix = "{{ url(config('lfm.url_prefix')) }}";
4747
</script>
4848

4949
<!-- CKEditor init -->

‎src/views/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<script src="{{ asset('vendor/laravel-filemanager/js/jquery.form.min.js') }}"></script>
150150
<script>
151151
var route_prefix = "{{ url('/') }}";
152-
var lfm_route = "{{ url(config('lfm.prefix')) }}";
152+
var lfm_route = "{{ url(config('lfm.url_prefix')) }}";
153153
var lang = {!! json_encode(trans('laravel-filemanager::lfm')) !!};
154154
</script>
155155
<script>{!! \File::get(base_path('vendor/unisharp/laravel-filemanager/public/js/script.js')) !!}</script>

0 commit comments

Comments
 (0)
0