diff options
author | Chris <ccbrown112@gmail.com> | 2017-11-09 14:46:20 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-09 14:46:20 -0600 |
commit | 10c5a927cb619f1aa2a599cbe3667820f4766bda (patch) | |
tree | f415540ab66115e62928d304c99b533398d7f226 /api | |
parent | b0c18ece0988b1573b2286bb73b32e48a1d8c59a (diff) | |
download | chat-10c5a927cb619f1aa2a599cbe3667820f4766bda.tar.gz chat-10c5a927cb619f1aa2a599cbe3667820f4766bda.tar.bz2 chat-10c5a927cb619f1aa2a599cbe3667820f4766bda.zip |
more global config ref cleanup (#7802)
Diffstat (limited to 'api')
-rw-r--r-- | api/admin.go | 2 | ||||
-rw-r--r-- | api/file.go | 2 | ||||
-rw-r--r-- | api/status.go | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/api/admin.go b/api/admin.go index 1e343fdfa..c6c632c59 100644 --- a/api/admin.go +++ b/api/admin.go @@ -189,7 +189,7 @@ func downloadComplianceReport(c *Context, w http.ResponseWriter, r *http.Request return } - reportBytes, err := app.GetComplianceFile(job) + reportBytes, err := c.App.GetComplianceFile(job) if err != nil { c.Err = err return diff --git a/api/file.go b/api/file.go index bcb79bd5c..20b13fcb7 100644 --- a/api/file.go +++ b/api/file.go @@ -332,5 +332,5 @@ func getPublicLink(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write([]byte(model.StringToJson(app.GeneratePublicLinkV3(c.GetSiteURLHeader(), info)))) + w.Write([]byte(model.StringToJson(c.App.GeneratePublicLinkV3(c.GetSiteURLHeader(), info)))) } diff --git a/api/status.go b/api/status.go index 70106ad8c..a86d80f98 100644 --- a/api/status.go +++ b/api/status.go @@ -8,7 +8,6 @@ import ( l4g "github.com/alecthomas/log4go" - "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -21,7 +20,7 @@ func (api *API) InitStatus() { } func getStatusesHttp(c *Context, w http.ResponseWriter, r *http.Request) { - statusMap := model.StatusMapToInterfaceMap(app.GetAllStatuses()) + statusMap := model.StatusMapToInterfaceMap(c.App.GetAllStatuses()) w.Write([]byte(model.StringInterfaceToJson(statusMap))) } |