Merge pull request #47149 from nextcloud/fix/disable-tags-editing

fix(files): Disable tags editing for shared files/folders with view only permission
pull/47147/head
John Molakvoæ 9 months ago committed by GitHub
commit 81b01c26c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      apps/files/src/services/FileInfo.js
  2. 1
      apps/files/src/views/Sidebar.vue
  3. 5
      apps/systemtags/src/components/SystemTags.vue
  4. 4
      dist/core-common.js
  5. 2
      dist/core-common.js.map
  6. 4
      dist/files-sidebar.js
  7. 2
      dist/files-sidebar.js.map

@ -24,6 +24,7 @@ export default async function(url) {
// TODO remove when no more legacy backbone is used
fileInfo.get = (key) => fileInfo[key]
fileInfo.isDirectory = () => fileInfo.mimetype === 'httpd/unix-directory'
fileInfo.canEdit = () => Boolean(fileInfo.permissions & OC.PERMISSION_UPDATE)
return fileInfo
}

@ -30,6 +30,7 @@
<div class="sidebar__description">
<SystemTags v-if="isSystemTagsEnabled && showTagsDefault"
v-show="showTags"
:disabled="!fileInfo?.canEdit()"
:file-id="fileInfo.id"
@has-tags="value => showTags = value" />
<LegacyView v-for="view in views"

@ -15,6 +15,7 @@
:options="sortedTags"
:value="selectedTags"
:create-option="createOption"
:disabled="disabled"
:taggable="true"
:passthru="true"
:fetch-tags="false"
@ -65,6 +66,10 @@ export default Vue.extend({
type: Number,
required: true,
},
disabled: {
type: Boolean,
default: false,
},
},
data() {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save