diff options
| author | George Goldberg <george@gberg.me> | 2017-07-07 15:36:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 15:36:17 +0100 |
| commit | db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9 (patch) | |
| tree | badd2021308c320d893824bc1ac1b28ba92d384d /model/license.go | |
| parent | 0495a519499d6cefa289982a94d8f42de541c1f0 (diff) | |
| download | chat-db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9.tar.gz chat-db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9.tar.bz2 chat-db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9.zip | |
PLT-6976: Elasticsearch capitalisation and tests. (#6839)
* Fixes Elasticsearch to have consistent capitalisation everywhere
across the code and UI (except the config file unfortunately).
* Adds basic unit tests for Elastichsearch.
* Adds a Elasticsearch docker image to the Makefile to enable testing
the Elasticsearch feature.
Diffstat (limited to 'model/license.go')
| -rw-r--r-- | model/license.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/model/license.go b/model/license.go index 443d78282..8d53bd4cd 100644 --- a/model/license.go +++ b/model/license.go @@ -49,7 +49,7 @@ type Features struct { MHPNS *bool `json:"mhpns"` SAML *bool `json:"saml"` PasswordRequirements *bool `json:"password_requirements"` - ElasticSearch *bool `json:"elastic_search"` + Elasticsearch *bool `json:"elastic_search"` Announcement *bool `json:"announcement"` // after we enabled more features for webrtc we'll need to control them with this FutureFeatures *bool `json:"future_features"` @@ -68,7 +68,7 @@ func (f *Features) ToMap() map[string]interface{} { "mhpns": *f.MHPNS, "saml": *f.SAML, "password": *f.PasswordRequirements, - "elastic_search": *f.ElasticSearch, + "elastic_search": *f.Elasticsearch, "future": *f.FutureFeatures, } } @@ -139,9 +139,9 @@ func (f *Features) SetDefaults() { *f.PasswordRequirements = *f.FutureFeatures } - if f.ElasticSearch == nil { - f.ElasticSearch = new(bool) - *f.ElasticSearch = *f.FutureFeatures + if f.Elasticsearch == nil { + f.Elasticsearch = new(bool) + *f.Elasticsearch = *f.FutureFeatures } if f.Announcement == nil { |