Merge branch 'master' into export-dashboard

Conflicts: .floo .flooignore
2016-05-18 08:08:15 +02:00
parent 05d064ca8d fc1891320e
commit 6632f883c0
42 changed files with 337 additions and 128 deletions
@@ -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 != "" {