From 1bd9559ca988777d434ff46458c224d5e9870003 Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Mon, 31 Aug 2020 13:17:57 +0200
Subject: [PATCH] Error handdling if nextcloud url is not given
---
packages/file-handling/src/file-sink.js | 4 ++--
packages/file-handling/src/file-source.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 303b6e3c..fcd06c96 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -204,7 +204,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
</div>
<div title="${this.nextcloudName}"
@click="${() => { this.activeDestination = "nextcloud"; this.loadWebdavDirectory();}}"
- class="${classMap({"active": this.activeDestination === "nextcloud", hidden: !this.hasEnabledDestination("nextcloud")})}">
+ class="${classMap({"active": this.activeDestination === "nextcloud", hidden: !this.hasEnabledDestination("nextcloud") || this.nextcloudWebDavUrl === "" || this.nextcloudAuthUrl === ""})}">
<dbp-icon class="nav-icon" name="cloud"></dbp-icon>
<p> ${this.nextcloudName} </p>
</div>
@@ -230,7 +230,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
</button>
</div>
</div>
- <div class="source-main ${classMap({"hidden": this.activeDestination !== "nextcloud"})}">
+ <div class="source-main ${classMap({"hidden": this.activeDestination !== "nextcloud" || this.nextcloudWebDavUrl === "" || this.nextcloudAuthUrl === ""})}">
<dbp-nextcloud-file-picker id="nextcloud-file-picker"
class="${classMap({hidden: this.nextcloudWebDavUrl === "" || this.nextcloudAuthUrl === ""})}"
directories-only
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index 66852397..f14bf58c 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -408,7 +408,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
</div>
<div title="Nextcloud"
@click="${() => { this.activeSource = "nextcloud"; this.loadWebdavDirectory();}}"
- class="${classMap({"active": this.activeSource === "nextcloud", hidden: !this.hasEnabledSource("nextcloud")})}">
+ class="${classMap({"active": this.activeSource === "nextcloud", hidden: !this.hasEnabledSource("nextcloud") || this.nextcloudWebDavUrl === "" || this.nextcloudAuthUrl === ""})}">
<dbp-icon class="nav-icon" name="cloud"></dbp-icon>
<p> ${this.nextcloudName} </p>
</div>
@@ -439,7 +439,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
</label>
</div>
</div>
- <div class="source-main ${classMap({"hidden": this.activeSource !== "nextcloud"})}">
+ <div class="source-main ${classMap({"hidden": this.activeSource !== "nextcloud" || this.nextcloudWebDavUrl === "" || this.nextcloudAuthUrl === ""})}">
<dbp-nextcloud-file-picker id="nextcloud-file-picker"
class="${classMap({hidden: this.nextcloudWebDavUrl === "" || this.nextcloudAuthUrl === ""})}"
?disabled="${this.disabled}"
--
GitLab