Merge pull request #1763 from nextcloud/backports/1760/stable26

[stable26] fix: hide upload button on public album shares
nextcloud · Apr 25, 2023 · 0492b31 · 0492b31
2 parents 02e4826 + e8f8cd6
commit 0492b31
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 29 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...ue-material-design-icons_ImagePlus_vue-src_components_Collection_CollectionCont-f9bef8.js b/...ue-material-design-icons_ImagePlus_vue-src_components_Collection_CollectionCont-f9bef8.js
diff --git a/...aterial-design-icons_ImagePlus_vue-src_components_Collection_CollectionCont-f9bef8.js.map b/...aterial-design-icons_ImagePlus_vue-src_components_Collection_CollectionCont-f9bef8.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2a64fd.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2a64fd.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2a64fd.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2a64fd.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2ca5cc.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2ca5cc.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2ca5cc.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2ca5cc.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_components_Collection_CollectionContent_vue.js b/js/photos-src_components_Collection_CollectionContent_vue.js
diff --git a/...tion_CollectionCont-f9bef8.js.LICENSE.txt → ...tion_CollectionContent_vue.js.LICENSE.txt b/...tion_CollectionCont-f9bef8.js.LICENSE.txt → ...tion_CollectionContent_vue.js.LICENSE.txt
diff --git a/js/photos-src_components_Collection_CollectionContent_vue.js.map b/js/photos-src_components_Collection_CollectionContent_vue.js.map
diff --git a/js/photos-src_views_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/src/views/PublicAlbumContent.vue b/src/views/PublicAlbumContent.vue
@@ -2,6 +2,7 @@
  - @copyright Copyright (c) 2022 Louis Chemineau <louis@chmn.me>
  -
  - @author Louis Chemineau <louis@chmn.me>
+ - @author Richard Steinmetz <richard@steinmetz.cloud>
  -
  - @license AGPL-3.0-or-later
  -
@@ -72,15 +73,17 @@
 			<NcEmptyContent slot="empty-content"
 				:title="t('photos', 'This album does not have any photos or videos yet!')"
 				class="album__empty">
-				<ImagePlus slot="icon" />
+				<ImageOff slot="icon" />
 
+				<!-- Public upload is not implemented yet
 				<NcButton slot="action"
 					type="primary"
 					:aria-label="t('photos', 'Add photos to this album')"
 					@click="showAddPhotosModal = true">
 					<Plus slot="icon" />
 					{{ t('photos', "Add") }}
 				</NcButton>
+				-->
 			</NcEmptyContent>
 		</CollectionContent>
 	</div>
@@ -91,12 +94,13 @@ import { mapActions, mapGetters } from 'vuex'
 import { createClient, getPatcher } from 'webdav'
 
 import MapMarker from 'vue-material-design-icons/MapMarker'
-import Plus from 'vue-material-design-icons/Plus'
-import ImagePlus from 'vue-material-design-icons/ImagePlus'
+// import Plus from 'vue-material-design-icons/Plus'
+// import ImagePlus from 'vue-material-design-icons/ImagePlus'
+import ImageOff from 'vue-material-design-icons/ImageOff'
 // import Download from 'vue-material-design-icons/Download'
 // import DownloadMultiple from 'vue-material-design-icons/DownloadMultiple'
 
-import { NcActions, NcButton, NcEmptyContent, /** NcActionSeparator, */ isMobile } from '@nextcloud/vue'
+import { NcActions, /** NcButton, */ NcEmptyContent, /** NcActionSeparator, */ isMobile } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
 import { generateUrl, generateRemoteUrl } from '@nextcloud/router'
@@ -123,14 +127,15 @@ export default {
 	name: 'PublicAlbumContent',
 	components: {
 		MapMarker,
-		Plus,
+		// Plus,
 		// Download,
 		// DownloadMultiple,
-		ImagePlus,
+		// ImagePlus,
+		ImageOff,
 		NcEmptyContent,
 		NcActions,
 		// NcActionSeparator,
-		NcButton,
+		// NcButton,
 		CollectionContent,
 		// ActionDownload,
 		HeaderNavigation,