Skip to content

[stable26] fix: hide upload button on public album shares #1763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 1 commit into from
Apr 25, 2023
Merged

[stable26] fix: hide upload button on public album shares #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/photos-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions ...ue-material-design-icons_ImagePlus_vue-src_components_Collection_CollectionCont-f9bef8.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...aterial-design-icons_ImagePlus_vue-src_components_Collection_CollectionCont-f9bef8.js.map
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2a64fd.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2a64fd.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2ca5cc.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-2ca5cc.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-public.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-public.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions js/photos-src_components_Collection_CollectionContent_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...tion_CollectionCont-f9bef8.js.LICENSE.txt → ...tion_CollectionContent_vue.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions js/photos-src_components_Collection_CollectionContent_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-src_views_AlbumContent_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-src_views_AlbumContent_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 12 additions & 7 deletions src/views/PublicAlbumContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
- @copyright Copyright (c) 2022 Louis Chemineau <[email protected]>
-
- @author Louis Chemineau <[email protected]>
- @author Richard Steinmetz <[email protected]>
-
- @license AGPL-3.0-or-later
-
Expand Down Expand Up @@ -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>
Expand All @@ -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'
Expand All @@ -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,
Expand Down