beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Frontend: Hide download button on files tab when download is disabled

Browse source
This commit is contained in:
theresa 2021-11-17 15:38:23 +01:00
parent 55e7a6d612
commit 842a6981a7
2 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/dialog/photo/files.vue
View file

@ -41,7 +41,7 @@
<translate>Actions</translate>
</td>
<td>
<v-btn small depressed dark color="primary-button" class="ma-0 action-download"
<v-btn v-if="features.download" small depressed dark color="primary-button" class="ma-0 action-download"
@click.stop.prevent="downloadFile(file)">
<translate>Download</translate>
</v-btn>

42
frontend/tests/acceptance/settings/general.js
View file

@ -14,7 +14,7 @@ test.meta("testID", "settings-general-001")("General Settings", async (t) => {
.contains("Search")
.click(Selector(".nav-browse"));
await page.setFilter("view", "Cards");
await page.search("photo:true");
await page.search("photo:true stack:true");
await page.toggleSelectNthPhoto(0);
await t
.click(Selector("button.action-menu"))
@ -26,6 +26,17 @@ test.meta("testID", "settings-general-001")("General Settings", async (t) => {
.ok()
.expect(Selector("button.action-private").visible)
.ok();
await page.editSelected();
await t
.click(Selector("#tab-files"))
.expect(Selector("button.action-download").nth(0).visible)
.ok()
.click(Selector("li.v-expansion-panel__container").nth(1))
.expect(Selector("button.action-download").nth(1).visible)
.ok()
.expect(Selector("button.action-delete").visible)
.ok()
.click(Selector("button.action-close"));
await page.clearSelection();
await t.click(Selector("div.is-photo").nth(0));
await t
@ -33,10 +44,11 @@ test.meta("testID", "settings-general-001")("General Settings", async (t) => {
.ok()
.expect(Selector(".action-download").exists)
.ok()
.click(Selector(".action-close"));
.hover(Selector('button[title="Close"]'))
.click(Selector('button[title="Close"]'));
if (t.browser.os.name !== "macOS") {
if (await Selector(".action-close").exists) {
await t.click(Selector(".action-close"));
if (await Selector('button[title="Close"]').exists) {
await t.click(Selector('button[title="Close"]'));
}
}
await t
@ -144,7 +156,7 @@ test.meta("testID", "settings-general-001")("General Settings", async (t) => {
.expect(Selector(".nav-browse").innerText)
.contains("Suche")
.click(Selector(".nav-browse"));
await page.search("photo:true");
await page.search("photo:true stack:true");
await page.toggleSelectNthPhoto(0);
await t
.click(Selector("button.action-menu"))
@ -155,7 +167,18 @@ test.meta("testID", "settings-general-001")("General Settings", async (t) => {
.expect(Selector("button.action-edit").visible)
.notOk()
.expect(Selector("button.action-private").exists)
.notOk();
.notOk()
.click(Selector("button.action-title-edit").nth(0))
.click(Selector("#tab-files"))
.expect(Selector("button.action-download").nth(0).visible)
.notOk()
.click(Selector("li.v-expansion-panel__container").nth(1))
.expect(Selector("button.action-download").nth(1).visible)
.notOk()
.expect(Selector("button.action-delete").visible)
.notOk()
.click(Selector("button.action-close"));
await page.search("photo:true");
await t
.hover(Selector(".is-photo.type-image").nth(0))
.click(Selector(".is-photo.type-image .action-fullscreen").nth(0));
@ -164,9 +187,10 @@ test.meta("testID", "settings-general-001")("General Settings", async (t) => {
.ok()
.expect(Selector(".action-download").exists)
.notOk()
.click(Selector(".action-close"));
if (await Selector(".action-close").visible) {
await t.click(Selector(".action-close"));
.hover(Selector('button[title="Schließen"]'))
.click(Selector('button[title="Schließen"]'));
if (await Selector('button[title="Schließen"]').visible) {
await t.click(Selector('button[title="Schließen"]'));
}
await page.toggleSelectNthPhoto(0);
await t