-
+
@@ -21,13 +21,13 @@
-
-
+
+
-
+
@@ -35,7 +35,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
@@ -63,9 +63,9 @@
{{ $t('actions.search') }}
- {{ $getCurrentLocationName() }}
+ {{ $getCurrentSectionName() }}
-
+
{{ $t('mobile.create') }}
@@ -78,6 +78,7 @@
+
{{ $t('Nothing shared with you') }}
@@ -87,7 +88,8 @@
-
+
+
{{ $t('empty_page.title') }}
@@ -98,6 +100,13 @@
{{ $t('empty_page.call_to_action') }}
+
+
+
+
+ {{ $t('There is Nothing Yet') }}
+
+
@@ -141,10 +150,20 @@
},
computed: {
...mapGetters([
+ 'currentTeamFolder',
'clipboard',
'config',
'user',
]),
+ canEdit() {
+ if (this.currentTeamFolder && this.user) {
+ let member = this.currentTeamFolder.data.relationships.members.data.find(member => member.data.id === this.user.data.id)
+
+ return member.data.attributes.permission === 'can-edit'
+ }
+
+ return false
+ },
isTeamFolderHomepage() {
return this.$isThisRoute(this.$route, ['SharedWithMe'])
&& ! this.$route.params.id
diff --git a/resources/js/views/FileView/TeamFolders.vue b/resources/js/views/FileView/TeamFolders.vue
index 33792075..2af0552a 100644
--- a/resources/js/views/FileView/TeamFolders.vue
+++ b/resources/js/views/FileView/TeamFolders.vue
@@ -86,7 +86,7 @@
{{ $t('actions.search') }}
- {{ $getCurrentLocationName() }}
+ {{ $getCurrentSectionName() }}
{{ $t('mobile.create') }}
diff --git a/resources/js/views/FileView/Trash.vue b/resources/js/views/FileView/Trash.vue
index 1689d802..7f46e625 100644
--- a/resources/js/views/FileView/Trash.vue
+++ b/resources/js/views/FileView/Trash.vue
@@ -48,7 +48,7 @@
{{ $t('actions.search')}}
- {{ $getCurrentLocationName() }}
+ {{ $getCurrentSectionName() }}
{{ $t('context_menu.empty_trash') }}
diff --git a/src/App/Providers/AuthServiceProvider.php b/src/App/Providers/AuthServiceProvider.php
index 3ad8c50f..99c7bf0c 100644
--- a/src/App/Providers/AuthServiceProvider.php
+++ b/src/App/Providers/AuthServiceProvider.php
@@ -33,7 +33,7 @@ class AuthServiceProvider extends ServiceProvider
Gate::define('maintenance', fn ($user) => $user->role === 'admin');
// Define user ability to edit file or folder
- collect(['can-edit', 'can-visit'])
+ collect(['can-edit', 'can-view'])
->each(function ($ability) {
Gate::define($ability, function (?User $user, File | Folder $item, ?Share $share) use ($ability) {
// If share link exist, then check share access
diff --git a/src/Domain/Files/Controllers/FileAccess/GetFileController.php b/src/Domain/Files/Controllers/FileAccess/GetFileController.php
index af22eb5f..2fd9ad3a 100644
--- a/src/Domain/Files/Controllers/FileAccess/GetFileController.php
+++ b/src/Domain/Files/Controllers/FileAccess/GetFileController.php
@@ -23,7 +23,7 @@ class GetFileController extends Controller
->where('basename', $filename)
->firstOrFail();
- if (! Gate::any(['can-edit', 'can-visit'], [$file, null])) {
+ if (! Gate::any(['can-edit', 'can-view'], [$file, null])) {
abort(403, 'Access Denied');
}
diff --git a/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php b/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php
index c8269954..4a91ae35 100644
--- a/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php
+++ b/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php
@@ -24,7 +24,7 @@ class GetThumbnailController extends Controller
->where('thumbnail', $filename)
->firstOrFail();
- if (! Gate::any(['can-edit', 'can-visit'], [$file, null])) {
+ if (! Gate::any(['can-edit', 'can-view'], [$file, null])) {
abort(403, 'Access Denied');
}
diff --git a/src/Domain/Files/Controllers/VisitorShowFileController.php b/src/Domain/Files/Controllers/VisitorShowFileController.php
index 56430b2a..6cda06c3 100644
--- a/src/Domain/Files/Controllers/VisitorShowFileController.php
+++ b/src/Domain/Files/Controllers/VisitorShowFileController.php
@@ -21,7 +21,7 @@ class VisitorShowFileController
->whereId($shared->item_id)
->firstOrFail();
- Gate::authorize('can-visit', [$file, $shared]);
+ Gate::authorize('can-view', [$file, $shared]);
// Set access urls
$file->setPublicUrl($shared->token);