From ebeb2da3d3e474c60f765020ede3cf23cfb03be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 4 Jul 2018 13:36:16 +0200
Subject: [PATCH] Fix displaying errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 settings/src/components/appList/appItem.vue |  8 ++++----
 settings/src/store/apps.js                  | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/settings/src/components/appList/appItem.vue b/settings/src/components/appList/appItem.vue
index 5a4a503f3c..f9d5754b50 100644
--- a/settings/src/components/appList/appItem.vue
+++ b/settings/src/components/appList/appItem.vue
@@ -51,10 +51,10 @@
 		<div class="actions">
 			<div class="warning" v-if="app.error">{{ app.error }}</div>
 			<div class="icon icon-loading-small" v-if="loading(app.id)"></div>
-			<input v-if="app.update" class="update" type="button" :value="t('settings', 'Update to {update}', {update:app.update})" v-on:click="update(app.id)" :disabled="installing || loading(app.id)" />
-			<input v-if="app.canUnInstall" class="uninstall" type="button" :value="t('settings', 'Remove')" v-on:click="remove(app.id)" :disabled="installing || loading(app.id)" />
-			<input v-if="app.active" class="enable" type="button" :value="t('settings','Disable')" v-on:click="disable(app.id)" :disabled="installing || loading(app.id)" />
-			<input v-if="!app.active" class="enable" type="button" :value="enableButtonText" v-on:click="enable(app.id)" v-tooltip.auto="enableButtonTooltip" :disabled="!app.canInstall || installing || loading(app.id)" />
+			<input v-if="app.update" class="update" type="button" :value="t('settings', 'Update to {update}', {update:app.update})" v-on:click.stop="update(app.id)" :disabled="installing || loading(app.id)" />
+			<input v-if="app.canUnInstall" class="uninstall" type="button" :value="t('settings', 'Remove')" v-on:click.stop="remove(app.id)" :disabled="installing || loading(app.id)" />
+			<input v-if="app.active" class="enable" type="button" :value="t('settings','Disable')" v-on:click.stop="disable(app.id)" :disabled="installing || loading(app.id)" />
+			<input v-if="!app.active" class="enable" type="button" :value="enableButtonText" v-on:click.stop="enable(app.id)" v-tooltip.auto="enableButtonTooltip" :disabled="!app.canInstall || installing || loading(app.id)" />
 		</div>
 	</div>
 </template>
diff --git a/settings/src/store/apps.js b/settings/src/store/apps.js
index c4539b14d9..99bd4af459 100644
--- a/settings/src/store/apps.js
+++ b/settings/src/store/apps.js
@@ -62,8 +62,13 @@ const mutations = {
 	},
 
 	setError(state, {appId, error}) {
-		let app = state.apps.find(app => app.id === appId);
-		app.error = error;
+		if (!Array.isArray(appId)) {
+			appId = [appId];
+		}
+		appId.forEach((_id) => {
+			let app = state.apps.find(app => app.id === _id);
+			app.error = error;
+		});
 	},
 
 	clearError(state, {appId, error}) {
@@ -199,10 +204,13 @@ const actions = {
 						});
 				})
 				.catch((error) => {
-					context.commit('setError', {appId: apps, error: t('settings', 'Error while enabling app')});
 					context.commit('stopLoading', apps);
 					context.commit('stopLoading', 'install');
-					context.commit('APPS_API_FAILURE', { appId, error })
+					context.commit('setError', {
+						appId: apps,
+						error: error.response.data.data.message
+					});
+					context.commit('APPS_API_FAILURE', { appId, error});
 				})
 		}).catch((error) => context.commit('API_FAILURE', { appId, error }));
 	},