diff --git a/pkg/config/config.go b/pkg/config/config.go index 36d6415..e936fdd 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -53,11 +53,12 @@ type Mailer struct { // ConfigProvider ie converted value in go types type ConfigProvider struct { - EnableSSL bool `json:"enableSSL"` - Database map[string]DatabaseObj `json:"database"` - AppConfig AppConfig `json:"appConfig"` - Authentication Authentication `json:"authentication"` - Mailer Mailer `json:"mailer"` + EnableSSL bool `json:"enableSSL"` + ShareDataOverMail bool `json:"shareDataOverMail"` + Database map[string]DatabaseObj `json:"database"` + AppConfig AppConfig `json:"appConfig"` + Authentication Authentication `json:"authentication"` + Mailer Mailer `json:"mailer"` } var C ConfigProvider diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 6db3fc3..f6823a2 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -167,7 +167,7 @@ func TestConfigProviderStruct(t *testing.T) { Authentication: Authentication{}, Mailer: Mailer{}, } - want := "config.ConfigProvider{EnableSSL:false, Database:map[string]config.DatabaseObj(nil), AppConfig:config.AppConfig{Debug:false, SecretKey:\"\", DefaultPort:\"\", CustomPort:\"\", UseCDN:false, Hostname:\"\"}, Authentication:config.Authentication{EnableLogin:false, EnableRegistration:false, EnableForgotPassword:false}, Mailer:config.Mailer{SmtpHost:\"\", SmtpPort:0, EmailId:\"\", BccEmailId:\"\", Username:\"\", Password:\"\"}}" + want := "config.ConfigProvider{EnableSSL:false, ShareDataOverMail:false, Database:map[string]config.DatabaseObj(nil), AppConfig:config.AppConfig{Debug:false, SecretKey:\"\", DefaultPort:\"\", CustomPort:\"\", UseCDN:false, Hostname:\"\"}, Authentication:config.Authentication{EnableLogin:false, EnableRegistration:false, EnableForgotPassword:false}, Mailer:config.Mailer{SmtpHost:\"\", SmtpPort:0, EmailId:\"\", BccEmailId:\"\", Username:\"\", Password:\"\"}}" got := fmt.Sprintf("%#v", c) if strings.Compare(want, got) != 0 { t.Errorf("GetString() = %s, want %s", got, want) diff --git a/server/setting/setting.go b/server/setting/setting.go index f497ab9..a661a8a 100644 --- a/server/setting/setting.go +++ b/server/setting/setting.go @@ -1,7 +1,9 @@ package setting import ( + "fmt" "github.com/puni9869/pinmyblogs/models" + "github.com/puni9869/pinmyblogs/pkg/config" "github.com/puni9869/pinmyblogs/pkg/database" "github.com/puni9869/pinmyblogs/pkg/logger" "net/http" @@ -31,7 +33,9 @@ func Setting(c *gin.Context) { } else { tmplCtx["DisplayName"] = user.DisplayName } - + } + if !config.C.ShareDataOverMail { + tmplCtx["ShareDataOverMail"] = fmt.Sprintf("%t", config.C.ShareDataOverMail) } c.HTML(http.StatusOK, "setting.tmpl", tmplCtx) } diff --git a/templates/setting/container.tmpl b/templates/setting/container.tmpl index 4d921df..daeb24d 100644 --- a/templates/setting/container.tmpl +++ b/templates/setting/container.tmpl @@ -63,7 +63,7 @@

Download .json

Download .html


-

Send me my data over email

+

Send me my data over email