Ver código fonte

Merge pull request #49368 from nextcloud/backport/49199/stable29

John Molakvoæ 1 semana atrás
pai
commit
42ca32b085
3 arquivos alterados com 14 adições e 14 exclusões
  1. 14 14
      apps/files/src/actions/deleteUtils.ts
  2. 0 0
      dist/files-init.js
  3. 0 0
      dist/files-init.js.map

+ 14 - 14
apps/files/src/actions/deleteUtils.ts

@@ -42,20 +42,6 @@ export const isAllFolders = (nodes: Node[]) => {
 }
 
 export const displayName = (nodes: Node[], view: View) => {
-	/**
-	 * If we're in the trashbin, we can only delete permanently
-	 */
-	if (view.id === 'trashbin' || !isTrashbinEnabled()) {
-		return t('files', 'Delete permanently')
-	}
-
-	/**
-	 * If we're in the sharing view, we can only unshare
-	 */
-	if (isMixedUnshareAndDelete(nodes)) {
-		return t('files', 'Delete and unshare')
-	}
-
 	/**
 	 * If those nodes are all the root node of a
 	 * share, we can only unshare them.
@@ -78,6 +64,20 @@ export const displayName = (nodes: Node[], view: View) => {
 		return t('files', 'Disconnect storages')
 	}
 
+	/**
+	 * If we're in the trashbin, we can only delete permanently
+	 */
+	if (view.id === 'trashbin' || !isTrashbinEnabled()) {
+		return t('files', 'Delete permanently')
+	}
+
+	/**
+	 * If we're in the sharing view, we can only unshare
+	 */
+	if (isMixedUnshareAndDelete(nodes)) {
+		return t('files', 'Delete and unshare')
+	}
+
 	/**
 	 * If we're only selecting files, use proper wording
 	 */

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/files-init.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/files-init.js.map


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff