From ed1d8aa889b9455c785eee07c6134170daf71d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 24 Apr 2020 18:59:59 +0200
Subject: Properly check for the server status on first load
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 src/components/AdminSettings.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 9ca13721..c39891a7 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -51,7 +51,7 @@
 						<em>{{ t('richdocuments', 'Collabora Online requires a seperate server acting as a WOPI-like Client to provide editing capabilities.') }}</em>
 					</p>
 					<div v-if="serverMode === 'custom'" class="option-inline">
-						<form @submit="updateServer">
+						<form @submit.prevent.stop="updateServer">
 							<p>
 								<label for="wopi_url">{{ t('richdocuments', 'URL (and Port) of Collabora Online-server') }}</label><br>
 								<input id="wopi_url" v-model="settings.wopi_url" type="text"
@@ -231,7 +231,7 @@ export default {
 	data() {
 		return {
 			serverMode: '',
-			serverError: SERVER_STATE_OK,
+			serverError: Object.values(OC.getCapabilities()['richdocuments'].collabora).length > 0 ? SERVER_STATE_OK : SERVER_STATE_CONNECTION_ERROR,
 			demoServers: null,
 			approvedDemoModal: false,
 			updating: false,
-- 
cgit v1.2.3