summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-08-25 10:24:52 -0400
committerGitHub <noreply@github.com>2017-08-25 10:24:52 -0400
commit086365fb84e1d8096993756b79558bc204b1df2e (patch)
tree566396508513df8b09de521a533d0331fd18efbd
parenta360ac6dbdf3d2487d12bc4435624a5227aeb845 (diff)
downloadchat-086365fb84e1d8096993756b79558bc204b1df2e.tar.gz
chat-086365fb84e1d8096993756b79558bc204b1df2e.tar.bz2
chat-086365fb84e1d8096993756b79558bc204b1df2e.zip
PLT-7417/PLT-7425 (#7278)
PLT-7417/PLT-7425 Update config.json defaults and removed admin console link settings
-rw-r--r--config/default.json8
-rw-r--r--model/config.go42
-rw-r--r--utils/config.go3
-rw-r--r--webapp/components/admin_console/admin_navbar_dropdown.jsx11
4 files changed, 14 insertions, 50 deletions
diff --git a/config/default.json b/config/default.json
index e7e67855a..7f03e035b 100644
--- a/config/default.json
+++ b/config/default.json
@@ -120,7 +120,8 @@
"AmazonS3Region": "us-east-1",
"AmazonS3Endpoint": "s3.amazonaws.com",
"AmazonS3SSL": true,
- "AmazonS3SignV2": false
+ "AmazonS3SignV2": false,
+ "AmazonS3SSE": false
},
"EmailSettings": {
"EnableSignUpWithEmail": true,
@@ -165,9 +166,6 @@
"AboutLink": "https://about.mattermost.com/default-about/",
"HelpLink": "https://about.mattermost.com/default-help/",
"ReportAProblemLink": "https://about.mattermost.com/default-report-a-problem/",
- "AdministratorsGuideLink": "https://about.mattermost.com/administrators-guide/",
- "TroubleshootingForumLink": "https://about.mattermost.com/troubleshooting-forum/",
- "CommercialSupportLink": "https://about.mattermost.com/commercial-support/",
"SupportEmail": "feedback@mattermost.com"
},
"AnnouncementSettings": {
@@ -310,4 +308,4 @@
"PluginSettings": {
"Plugins": {}
}
-} \ No newline at end of file
+}
diff --git a/model/config.go b/model/config.go
index 9906723e7..b3365a49a 100644
--- a/model/config.go
+++ b/model/config.go
@@ -310,15 +310,12 @@ type PrivacySettings struct {
}
type SupportSettings struct {
- TermsOfServiceLink *string
- PrivacyPolicyLink *string
- AboutLink *string
- HelpLink *string
- ReportAProblemLink *string
- AdministratorsGuideLink *string
- TroubleshootingForumLink *string
- CommercialSupportLink *string
- SupportEmail *string
+ TermsOfServiceLink *string
+ PrivacyPolicyLink *string
+ AboutLink *string
+ HelpLink *string
+ ReportAProblemLink *string
+ SupportEmail *string
}
type AnnouncementSettings struct {
@@ -889,33 +886,6 @@ func (o *Config) SetDefaults() {
*o.SupportSettings.ReportAProblemLink = SUPPORT_SETTINGS_DEFAULT_REPORT_A_PROBLEM_LINK
}
- if !IsSafeLink(o.SupportSettings.AdministratorsGuideLink) {
- *o.SupportSettings.AdministratorsGuideLink = ""
- }
-
- if o.SupportSettings.AdministratorsGuideLink == nil {
- o.SupportSettings.AdministratorsGuideLink = new(string)
- *o.SupportSettings.AdministratorsGuideLink = SUPPORT_SETTINGS_DEFAULT_ADMINISTRATORS_GUIDE_LINK
- }
-
- if !IsSafeLink(o.SupportSettings.TroubleshootingForumLink) {
- *o.SupportSettings.TroubleshootingForumLink = ""
- }
-
- if o.SupportSettings.TroubleshootingForumLink == nil {
- o.SupportSettings.TroubleshootingForumLink = new(string)
- *o.SupportSettings.TroubleshootingForumLink = SUPPORT_SETTINGS_DEFAULT_TROUBLESHOOTING_FORUM_LINK
- }
-
- if !IsSafeLink(o.SupportSettings.CommercialSupportLink) {
- *o.SupportSettings.CommercialSupportLink = ""
- }
-
- if o.SupportSettings.CommercialSupportLink == nil {
- o.SupportSettings.CommercialSupportLink = new(string)
- *o.SupportSettings.CommercialSupportLink = SUPPORT_SETTINGS_DEFAULT_COMMERCIAL_SUPPORT_LINK
- }
-
if o.SupportSettings.SupportEmail == nil {
o.SupportSettings.SupportEmail = new(string)
*o.SupportSettings.SupportEmail = SUPPORT_SETTINGS_DEFAULT_SUPPORT_EMAIL
diff --git a/utils/config.go b/utils/config.go
index af15c5e93..54d768f64 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -471,9 +471,6 @@ func getClientConfig(c *model.Config) map[string]string {
props["AboutLink"] = *c.SupportSettings.AboutLink
props["HelpLink"] = *c.SupportSettings.HelpLink
props["ReportAProblemLink"] = *c.SupportSettings.ReportAProblemLink
- props["AdministratorsGuideLink"] = *c.SupportSettings.AdministratorsGuideLink
- props["TroubleshootingForumLink"] = *c.SupportSettings.TroubleshootingForumLink
- props["CommercialSupportLink"] = *c.SupportSettings.CommercialSupportLink
props["SupportEmail"] = *c.SupportSettings.SupportEmail
props["EnableFileAttachments"] = strconv.FormatBool(*c.FileSettings.EnableFileAttachments)
diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx
index d46732d40..6ef4906f5 100644
--- a/webapp/components/admin_console/admin_navbar_dropdown.jsx
+++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx
@@ -67,9 +67,8 @@ export default class AdminNavbarDropdown extends React.Component {
}
render() {
- const config = global.window.mm_config;
- var teamsArray = []; // Array of team objects
- var teams = []; // Array of team components
+ var teamsArray = []; // Array of team objects
+ var teams = []; // Array of team components
let switchTeams;
if (this.state.teamMembers && this.state.teamMembers.length > 0) {
@@ -154,7 +153,7 @@ export default class AdminNavbarDropdown extends React.Component {
/>
<li>
<Link
- to={config.AdministratorsGuideLink}
+ to='https://about.mattermost.com/administrators-guide/'
rel='noopener noreferrer'
target='_blank'
>
@@ -166,7 +165,7 @@ export default class AdminNavbarDropdown extends React.Component {
</li>
<li>
<Link
- to={config.TroubleshootingForumLink}
+ to='https://about.mattermost.com/troubleshooting-forum/'
rel='noopener noreferrer'
target='_blank'
>
@@ -178,7 +177,7 @@ export default class AdminNavbarDropdown extends React.Component {
</li>
<li>
<Link
- to={config.CommercialSupportLink}
+ to='https://about.mattermost.com/commercial-support/'
rel='noopener noreferrer'
target='_blank'
>