From 958f97232f917c54e02cacbe4dd4206579580c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 17 May 2016 21:51:19 +0200
Subject: [PATCH] fix(pluginlist): fixed issue with plugin list, fixes #5068

---
 pkg/plugins/queries.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/plugins/queries.go b/pkg/plugins/queries.go
index b930c9575a3..5ae1825a88f 100644
--- a/pkg/plugins/queries.go
+++ b/pkg/plugins/queries.go
@@ -24,7 +24,16 @@ func GetPluginSettings(orgId int64) (map[string]*m.PluginSettingInfoDTO, error)
 		}
 
 		// default to enabled true
-		opt := &m.PluginSettingInfoDTO{Enabled: true}
+		opt := &m.PluginSettingInfoDTO{
+			PluginId: pluginDef.Id,
+			OrgId:    orgId,
+			Enabled:  true,
+		}
+
+		// apps are disabled by default
+		if pluginDef.Type == PluginTypeApp {
+			opt.Enabled = false
+		}
 
 		// if it's included in app check app settings
 		if pluginDef.IncludedInAppId != "" {