Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

#47 emailing not working #48

Merged
merged 2 commits into from
Nov 30, 2020
Merged

#47 emailing not working #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83b64cc
update path
mark-prins Nov 29, 2020
ad3dccc
signing from env vars
mark-prins Nov 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": "grafana-toolkit plugin:test",
"dev": "grafana-toolkit plugin:dev",
"watch": "grafana-toolkit plugin:dev --watch",
"sign": "GRAFANA_API_KEY='eyJrIjoiYTEzZTE2YTBiMGM2MzI2MjcyMjU3ZmM4MTJiYTRjOWRlN2M5OGIzNSIsIm4iOiJtU3VwcGx5IiwiaWQiOjQzNDc1Mn0=' grafana-toolkit plugin:sign --signatureType private --rootUrls http://demo-board.msupply.org"
"sign": "grafana-toolkit plugin:sign --signatureType private --rootUrls http://demo-board.msupply.org,https://liberia.msupply.org"
},
"author": "josh",
"license": "Apache-2.0",
Expand Down
3 changes: 1 addition & 2 deletions backend/pkg/reporter/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,7 @@ func (r *Report) Write(auth auth.AuthConfig) error {

func GetFilePath(fileName string) string {

homePath, _ := filepath.Abs(".")
filePath := filepath.Join(homePath, "data", fileName+".xlsx")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh - sorry I missed it!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto.

filePath := filepath.Join("..", "data", fileName+".xlsx")

log.DefaultLogger.Debug("mSupply App: ReportFilePath=" + filePath)
return filePath
Expand Down