@@ -194,11 +194,6 @@ func Profile(ctx *middleware.Context) { | |||||
ctx.Redirect(setting.AppSubUrl + "/org/" + u.Name) | ctx.Redirect(setting.AppSubUrl + "/org/" + u.Name) | ||||
return | return | ||||
} | } | ||||
// For security reason, hide e-mail address for anonymous visitors. | |||||
if !ctx.IsSigned { | |||||
u.Email = "" | |||||
} | |||||
ctx.Data["Owner"] = u | ctx.Data["Owner"] = u | ||||
tab := ctx.Query("tab") | tab := ctx.Query("tab") | ||||
@@ -262,7 +257,7 @@ func Email2User(ctx *middleware.Context) { | |||||
ctx.Redirect(setting.AppSubUrl + "/user/" + u.Name) | ctx.Redirect(setting.AppSubUrl + "/user/" + u.Name) | ||||
} | } | ||||
func Issues(ctx *middleware.Context) { | |||||
func Issues(ctx *middleware.Context) { | |||||
ctx.Data["Title"] = ctx.Tr("issues") | ctx.Data["Title"] = ctx.Tr("issues") | ||||
ctx.Data["PageIsDashboard"] = true | ctx.Data["PageIsDashboard"] = true | ||||
ctx.Data["PageIsIssues"] = true | ctx.Data["PageIsIssues"] = true | ||||
@@ -389,8 +384,8 @@ func Issues(ctx *middleware.Context) { | |||||
} else { | } else { | ||||
ctx.Data["ShowCount"] = issueStats.OpenCount | ctx.Data["ShowCount"] = issueStats.OpenCount | ||||
} | } | ||||
ctx.Data["ContextUser"] = ctx.User | ctx.Data["ContextUser"] = ctx.User | ||||
ctx.HTML(200, ISSUES) | ctx.HTML(200, ISSUES) | ||||
} | } |
@@ -12,7 +12,7 @@ | |||||
<ul class="text-grey"> | <ul class="text-grey"> | ||||
{{if .Org.Location}}<li><span class="octicon octicon-location"></span> <span>{{.Org.Location}}</span></li>{{end}} | {{if .Org.Location}}<li><span class="octicon octicon-location"></span> <span>{{.Org.Location}}</span></li>{{end}} | ||||
{{if .Org.Website}}<li><span class="octicon octicon-link"></span> <a target="_blank" href="{{.Org.Website}}">{{.Org.Website}}</a></li>{{end}} | {{if .Org.Website}}<li><span class="octicon octicon-link"></span> <a target="_blank" href="{{.Org.Website}}">{{.Org.Website}}</a></li>{{end}} | ||||
{{if .Org.Email}}<li><span class="octicon octicon-mail"></span> <a href="mailto:{{.Org.Email}}">{{.Org.Email}}</a></li>{{end}} | |||||
{{if and .Org.Email .IsSigned}}<li><span class="octicon octicon-mail"></span> <a href="mailto:{{.Org.Email}}">{{.Org.Email}}</a></li>{{end}} | |||||
</ul> | </ul> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -22,7 +22,7 @@ | |||||
{{if .Owner.Location}} | {{if .Owner.Location}} | ||||
<li class="list-group-item"><i class="octicon octicon-location"></i> {{.Owner.Location}}</li> | <li class="list-group-item"><i class="octicon octicon-location"></i> {{.Owner.Location}}</li> | ||||
{{end}} | {{end}} | ||||
{{if .Owner.Email}} | |||||
{{if and .Owner.Email .IsSigned}} | |||||
<li class="list-group-item"><i class="octicon octicon-mail"></i> <a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a></li> | <li class="list-group-item"><i class="octicon octicon-mail"></i> <a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a></li> | ||||
{{end}} | {{end}} | ||||
{{if .Owner.Website}} | {{if .Owner.Website}} | ||||