diff --git a/pkg/context/auth.go b/pkg/context/auth.go index d2bfe6035..9ad5cdd0f 100644 --- a/pkg/context/auth.go +++ b/pkg/context/auth.go @@ -30,20 +30,20 @@ func Toggle(options *ToggleOptions) macaron.Handler { } // Check prohibit login users. - if ctx.IsSigned && ctx.User.ProhibitLogin { + if ctx.IsLogged && ctx.User.ProhibitLogin { ctx.Data["Title"] = ctx.Tr("auth.prohibit_login") ctx.HTML(200, "user/auth/prohibit_login") return } // Check non-logged users landing page. - if !ctx.IsSigned && ctx.Req.RequestURI == "/" && setting.LandingPageURL != setting.LANDING_PAGE_HOME { + if !ctx.IsLogged && ctx.Req.RequestURI == "/" && setting.LandingPageURL != setting.LANDING_PAGE_HOME { ctx.Redirect(setting.AppSubURL + string(setting.LandingPageURL)) return } // Redirect to dashboard if user tries to visit any non-login page. - if options.SignOutRequired && ctx.IsSigned && ctx.Req.RequestURI != "/" { + if options.SignOutRequired && ctx.IsLogged && ctx.Req.RequestURI != "/" { ctx.Redirect(setting.AppSubURL + "/") return } @@ -56,7 +56,7 @@ func Toggle(options *ToggleOptions) macaron.Handler { } if options.SignInRequired { - if !ctx.IsSigned { + if !ctx.IsLogged { // Restrict API calls with error message. if auth.IsAPIPath(ctx.Req.URL.Path) { ctx.JSON(403, map[string]string{ @@ -76,7 +76,7 @@ func Toggle(options *ToggleOptions) macaron.Handler { } // Redirect to log in page if auto-signin info is provided and has not signed in. - if !options.SignOutRequired && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) && + if !options.SignOutRequired && !ctx.IsLogged && !auth.IsAPIPath(ctx.Req.URL.Path) && len(ctx.GetCookie(setting.CookieUserName)) > 0 { ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubURL+ctx.Req.RequestURI), 0, setting.AppSubURL) ctx.Redirect(setting.AppSubURL + "/user/login") diff --git a/pkg/context/context.go b/pkg/context/context.go index 1649dc3dd..fa4ed16e4 100644 --- a/pkg/context/context.go +++ b/pkg/context/context.go @@ -34,18 +34,20 @@ type Context struct { Session session.Store User *models.User - IsSigned bool + IsLogged bool IsBasicAuth bool Repo *Repository Org *Organization } -func (ctx *Context) UserID() int64 { - if !ctx.IsSigned { +// UserID returns ID of current logged in user. +// It returns 0 if visitor is anonymous. +func (c *Context) UserID() int64 { + if !c.IsLogged { return 0 } - return ctx.User.ID + return c.User.ID } // HasError returns true if error occurs in form validation. @@ -112,7 +114,7 @@ func (ctx *Context) Handle(status int, title string, err error) { case http.StatusInternalServerError: ctx.Data["Title"] = "Internal Server Error" log.Error(2, "%s: %v", title, err) - if !setting.ProdMode || (ctx.IsSigned && ctx.User.IsAdmin) { + if !setting.ProdMode || (ctx.IsLogged && ctx.User.IsAdmin) { ctx.Data["ErrorMsg"] = err } } @@ -193,15 +195,15 @@ func Contexter() macaron.Handler { ctx.User, ctx.IsBasicAuth = auth.SignedInUser(ctx.Context, ctx.Session) if ctx.User != nil { - ctx.IsSigned = true - ctx.Data["IsSigned"] = ctx.IsSigned - ctx.Data["SignedUser"] = ctx.User - ctx.Data["SignedUserID"] = ctx.User.ID - ctx.Data["SignedUserName"] = ctx.User.Name + ctx.IsLogged = true + ctx.Data["IsLogged"] = ctx.IsLogged + ctx.Data["LoggedUser"] = ctx.User + ctx.Data["LoggedUserID"] = ctx.User.ID + ctx.Data["LoggedUserName"] = ctx.User.Name ctx.Data["IsAdmin"] = ctx.User.IsAdmin } else { - ctx.Data["SignedUserID"] = 0 - ctx.Data["SignedUserName"] = "" + ctx.Data["LoggedUserID"] = 0 + ctx.Data["LoggedUserName"] = "" } // If request sends files, parse them here otherwise the Query() can't be parsed and the CsrfToken will be invalid. diff --git a/pkg/context/org.go b/pkg/context/org.go index 497856747..be0b0572b 100644 --- a/pkg/context/org.go +++ b/pkg/context/org.go @@ -63,12 +63,12 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { } // Admin has super access. - if ctx.IsSigned && ctx.User.IsAdmin { + if ctx.IsLogged && ctx.User.IsAdmin { ctx.Org.IsOwner = true ctx.Org.IsMember = true ctx.Org.IsTeamMember = true ctx.Org.IsTeamAdmin = true - } else if ctx.IsSigned { + } else if ctx.IsLogged { ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.ID) if ctx.Org.IsOwner { ctx.Org.IsMember = true diff --git a/pkg/context/repo.go b/pkg/context/repo.go index a1924954c..ecaf7ff6c 100644 --- a/pkg/context/repo.go +++ b/pkg/context/repo.go @@ -151,7 +151,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { } // Check if the user is the same as the repository owner - if ctx.IsSigned && ctx.User.LowerName == strings.ToLower(ownerName) { + if ctx.IsLogged && ctx.User.LowerName == strings.ToLower(ownerName) { owner = ctx.User } else { owner, err = models.GetUserByName(ownerName) @@ -194,7 +194,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { ctx.Data["RepoRelPath"] = ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name // Admin has super access. - if ctx.IsSigned && ctx.User.IsAdmin { + if ctx.IsLogged && ctx.User.IsAdmin { ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER } else { mode, err := models.AccessLevel(ctx.UserID(), repo) @@ -278,7 +278,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { ctx.Data["CloneLink"] = repo.CloneLink() ctx.Data["WikiCloneLink"] = repo.WikiCloneLink() - if ctx.IsSigned { + if ctx.IsLogged { ctx.Data["IsWatchingRepo"] = models.IsWatching(ctx.User.ID, repo.ID) ctx.Data["IsStaringRepo"] = models.IsStaring(ctx.User.ID, repo.ID) } @@ -424,7 +424,7 @@ func RepoRef() macaron.Handler { ctx.Data["IsViewCommit"] = ctx.Repo.IsViewCommit // People who have push access or have fored repository can propose a new pull request. - if ctx.Repo.IsWriter() || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) { + if ctx.Repo.IsWriter() || (ctx.IsLogged && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) { // Pull request is allowed if this is a fork repository // and base repository accepts pull requests. if ctx.Repo.Repository.BaseRepo != nil { @@ -459,7 +459,7 @@ func RepoRef() macaron.Handler { func RequireRepoAdmin() macaron.Handler { return func(ctx *Context) { - if !ctx.IsSigned || (!ctx.Repo.IsAdmin() && !ctx.User.IsAdmin) { + if !ctx.IsLogged || (!ctx.Repo.IsAdmin() && !ctx.User.IsAdmin) { ctx.NotFound() return } @@ -468,7 +468,7 @@ func RequireRepoAdmin() macaron.Handler { func RequireRepoWriter() macaron.Handler { return func(ctx *Context) { - if !ctx.IsSigned || (!ctx.Repo.IsWriter() && !ctx.User.IsAdmin) { + if !ctx.IsLogged || (!ctx.Repo.IsWriter() && !ctx.User.IsAdmin) { ctx.NotFound() return } diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index d4aa8aee9..b54e47b7d 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -34,7 +34,7 @@ func repoAssignment() macaron.Handler { ) // Check if the user is the same as the repository owner. - if ctx.IsSigned && ctx.User.LowerName == strings.ToLower(userName) { + if ctx.IsLogged && ctx.User.LowerName == strings.ToLower(userName) { owner = ctx.User } else { owner, err = models.GetUserByName(userName) @@ -63,7 +63,7 @@ func repoAssignment() macaron.Handler { return } - if ctx.IsSigned && ctx.User.IsAdmin { + if ctx.IsLogged && ctx.User.IsAdmin { ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER } else { mode, err := models.AccessLevel(ctx.User.ID, repo) @@ -86,7 +86,7 @@ func repoAssignment() macaron.Handler { // Contexter middleware already checks token for user sign in process. func reqToken() macaron.Handler { return func(ctx *context.Context) { - if !ctx.IsSigned { + if !ctx.IsLogged { ctx.Error(401) return } @@ -104,7 +104,7 @@ func reqBasicAuth() macaron.Handler { func reqAdmin() macaron.Handler { return func(ctx *context.Context) { - if !ctx.IsSigned || !ctx.User.IsAdmin { + if !ctx.IsLogged || !ctx.User.IsAdmin { ctx.Error(403) return } diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index e095954aa..fdb3e7a59 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -28,7 +28,7 @@ func Search(ctx *context.APIContext) { } // Check visibility. - if ctx.IsSigned && opts.OwnerID > 0 { + if ctx.IsLogged && opts.OwnerID > 0 { if ctx.User.ID == opts.OwnerID { opts.Private = true } else { diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index d797c650b..11c3b8bbf 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -41,7 +41,7 @@ func Search(ctx *context.APIContext) { AvatarUrl: users[i].AvatarLink(), FullName: users[i].FullName, } - if ctx.IsSigned { + if ctx.IsLogged { results[i].Email = users[i].Email } } @@ -64,7 +64,7 @@ func GetInfo(ctx *context.APIContext) { } // Hide user e-mail when API caller isn't signed in. - if !ctx.IsSigned { + if !ctx.IsLogged { u.Email = "" } ctx.JSON(200, u.APIFormat()) diff --git a/routers/home.go b/routers/home.go index eaf338155..7d9ee27b7 100644 --- a/routers/home.go +++ b/routers/home.go @@ -21,7 +21,7 @@ const ( ) func Home(ctx *context.Context) { - if ctx.IsSigned { + if ctx.IsLogged { if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm { ctx.Data["Title"] = ctx.Tr("auth.active_your_account") ctx.HTML(200, user.ACTIVATE) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 61401b435..72b1a3882 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -70,7 +70,7 @@ func MustAllowPulls(ctx *context.Context) { } // User can send pull request if owns a forked repository. - if ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID) { + if ctx.IsLogged && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID) { ctx.Repo.PullRequest.Allowed = true ctx.Repo.PullRequest.HeadInfo = ctx.User.Name + ":" + ctx.Repo.BranchName } @@ -115,7 +115,7 @@ func issues(ctx *context.Context, isPullList bool) { } // Must sign in to see issues about you. - if viewType != "all" && !ctx.IsSigned { + if viewType != "all" && !ctx.IsLogged { ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubURL+ctx.Req.RequestURI), 0, setting.AppSubURL) ctx.Redirect(setting.AppSubURL + "/user/login") return @@ -138,7 +138,7 @@ func issues(ctx *context.Context, isPullList bool) { } var uid int64 = -1 - if ctx.IsSigned { + if ctx.IsLogged { uid = ctx.User.ID } @@ -197,7 +197,7 @@ func issues(ctx *context.Context, isPullList bool) { // Get posters. for i := range issues { - if !ctx.IsSigned { + if !ctx.IsLogged { issues[i].IsRead = true continue } @@ -587,7 +587,7 @@ func viewIssue(ctx *context.Context, isPullList bool) { } } - if ctx.IsSigned { + if ctx.IsLogged { // Update issue-user. if err = issue.ReadBy(ctx.User.ID); err != nil { ctx.Handle(500, "ReadBy", err) @@ -652,7 +652,7 @@ func viewIssue(ctx *context.Context, isPullList bool) { ctx.Data["Participants"] = participants ctx.Data["NumParticipants"] = len(participants) ctx.Data["Issue"] = issue - ctx.Data["IsIssueOwner"] = ctx.Repo.IsWriter() || (ctx.IsSigned && issue.IsPoster(ctx.User.ID)) + ctx.Data["IsIssueOwner"] = ctx.Repo.IsWriter() || (ctx.IsLogged && issue.IsPoster(ctx.User.ID)) ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login?redirect_to=" + ctx.Data["Link"].(string) ctx.HTML(200, ISSUE_VIEW) } @@ -687,7 +687,7 @@ func UpdateIssueTitle(ctx *context.Context) { return } - if !ctx.IsSigned || (!issue.IsPoster(ctx.User.ID) && !ctx.Repo.IsWriter()) { + if !ctx.IsLogged || (!issue.IsPoster(ctx.User.ID) && !ctx.Repo.IsWriter()) { ctx.Error(403) return } @@ -714,7 +714,7 @@ func UpdateIssueContent(ctx *context.Context) { return } - if !ctx.IsSigned || (ctx.User.ID != issue.PosterID && !ctx.Repo.IsWriter()) { + if !ctx.IsLogged || (ctx.User.ID != issue.PosterID && !ctx.Repo.IsWriter()) { ctx.Error(403) return } @@ -843,7 +843,7 @@ func NewComment(ctx *context.Context, f form.CreateComment) { var comment *models.Comment defer func() { // Check if issue admin/poster changes the status of issue. - if (ctx.Repo.IsWriter() || (ctx.IsSigned && issue.IsPoster(ctx.User.ID))) && + if (ctx.Repo.IsWriter() || (ctx.IsLogged && issue.IsPoster(ctx.User.ID))) && (f.Status == "reopen" || f.Status == "close") && !(issue.IsPull && issue.PullRequest.HasMerged) { diff --git a/routers/repo/pull.go b/routers/repo/pull.go index b88500e81..15e283d13 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -153,7 +153,7 @@ func checkPullInfo(ctx *context.Context) *models.Issue { return nil } - if ctx.IsSigned { + if ctx.IsLogged { // Update issue-user. if err = issue.ReadBy(ctx.User.ID); err != nil { ctx.Handle(500, "ReadBy", err) diff --git a/routers/user/home.go b/routers/user/home.go index 745c2afac..431c196dd 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -379,7 +379,7 @@ func showOrgProfile(ctx *context.Context) { count int64 err error ) - if ctx.IsSigned && !ctx.User.IsAdmin { + if ctx.IsLogged && !ctx.User.IsAdmin { repos, count, err = org.GetUserRepositories(ctx.User.ID, page, setting.UI.User.RepoPagingNum) if err != nil { ctx.Handle(500, "GetUserRepositories", err) @@ -387,7 +387,7 @@ func showOrgProfile(ctx *context.Context) { } ctx.Data["Repos"] = repos } else { - showPrivate := ctx.IsSigned && ctx.User.IsAdmin + showPrivate := ctx.IsLogged && ctx.User.IsAdmin repos, err = models.GetUserRepositories(&models.UserRepoOptions{ UserID: org.ID, Private: showPrivate, diff --git a/routers/user/profile.go b/routers/user/profile.go index baf9a9412..649814f05 100644 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -73,7 +73,7 @@ func Profile(ctx *context.Context) { ctx.Data["PageIsUserProfile"] = true ctx.Data["Owner"] = ctxUser - orgs, err := models.GetOrgsByUserID(ctxUser.ID, ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID)) + orgs, err := models.GetOrgsByUserID(ctxUser.ID, ctx.IsLogged && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID)) if err != nil { ctx.Handle(500, "GetOrgsByUserIDDesc", err) return @@ -95,7 +95,7 @@ func Profile(ctx *context.Context) { page = 1 } - showPrivate := ctx.IsSigned && (ctxUser.ID == ctx.User.ID || ctx.User.IsAdmin) + showPrivate := ctx.IsLogged && (ctxUser.ID == ctx.User.ID || ctx.User.IsAdmin) ctx.Data["Repos"], err = models.GetUserRepositories(&models.UserRepoOptions{ UserID: ctxUser.ID, Private: showPrivate, diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 33a58eae7..71551ac7a 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -90,7 +90,7 @@ - {{if .IsSigned}} + {{if .IsLogged}} {{.i18n.Tr "dashboard"}} {{.i18n.Tr "issues"}} {{.i18n.Tr "pull_requests"}} @@ -106,7 +106,7 @@ */}} - {{if .IsSigned}} + {{if .IsLogged}}
@@ -120,7 +120,7 @@ {{.i18n.Tr "new_migrate"}} - {{if .SignedUser.CanCreateOrganization}} + {{if .LoggedUser.CanCreateOrganization}} {{.i18n.Tr "new_org"}} @@ -130,17 +130,17 @@
- + {{.i18n.Tr "user_profile_and_more"}}
- {{.i18n.Tr "signed_in_as"}} {{.SignedUser.Name}} + {{.i18n.Tr "signed_in_as"}} {{.LoggedUser.Name}}
- + {{.i18n.Tr "your_profile"}} diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index c13ccc697..6f1b2ee81 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -16,7 +16,7 @@ {{if .Location}} {{.Location}} {{end}} - {{if and .Email $.IsSigned}} + {{if and .Email $.IsLogged}} {{.Email}} {{end}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index d7514d8ba..67ab1f76a 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -28,10 +28,10 @@ {{ $isPublic := .IsPublicMember $.Org.ID}} {{if $isPublic}} {{$.i18n.Tr "org.members.public"}} - {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.public_helper"}}){{end}} + {{if or (eq $.LoggedUser.ID .ID) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.public_helper"}}){{end}} {{else}} {{$.i18n.Tr "org.members.private"}} - {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.private_helper"}}){{end}} + {{if or (eq $.LoggedUser.ID .ID) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.private_helper"}}){{end}} {{end}}
@@ -45,7 +45,7 @@
- {{if eq $.SignedUser.ID .ID}} + {{if eq $.LoggedUser.ID .ID}} {{$.i18n.Tr "org.members.leave"}} {{else if $.IsOrganizationOwner}} {{$.i18n.Tr "org.members.remove"}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index dcd8d33b2..fdf323c0d 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -33,7 +33,7 @@
- {{if .SignedUser.IsAdmin}} + {{if .LoggedUser.IsAdmin}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 1c707e93b..ca5aceea1 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -26,7 +26,7 @@
{{.CSRFTokenHTML}} - +
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 02cb8d7d2..12f989a68 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -2,10 +2,10 @@

{{.Team.Name}}
- {{if .Team.IsMember $.SignedUser.ID}} - {{$.i18n.Tr "org.teams.leave"}} + {{if .Team.IsMember $.LoggedUser.ID}} + {{$.i18n.Tr "org.teams.leave"}} {{else if .IsOrganizationOwner}} - {{$.i18n.Tr "org.teams.join"}} + {{$.i18n.Tr "org.teams.join"}} {{end}}

diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 871418114..2b4445ca3 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -16,10 +16,10 @@
{{.Name}}
- {{if .IsMember $.SignedUser.ID}} - {{$.i18n.Tr "org.teams.leave"}} + {{if .IsMember $.LoggedUser.ID}} + {{$.i18n.Tr "org.teams.leave"}} {{else if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.teams.join"}} + {{$.i18n.Tr "org.teams.join"}} {{end}}
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 06daa3609..25c8dc278 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -19,9 +19,9 @@
-
- - {{.SignedUser.ShortName 20}} +
+ + {{.LoggedUser.ShortName 20}}
{{range .Orgs}}
diff --git a/templates/repo/diff/page.tmpl b/templates/repo/diff/page.tmpl index 4d2f6bc10..eae67b7f9 100644 --- a/templates/repo/diff/page.tmpl +++ b/templates/repo/diff/page.tmpl @@ -14,7 +14,7 @@
{{if .Author}} - {{.Commit.Author.Name}} {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} + {{.Commit.Author.Name}} {{if .IsLogged}}<{{.Commit.Author.Email}}>{{end}} {{else}} {{.Commit.Author.Name}} diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 96b0dcbd3..6aee9f1d1 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -1,5 +1,5 @@
- +

{{.i18n.Tr "repo.editor.commit_changes"}}

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 3a2d48f47..cce2dbfc3 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -33,7 +33,7 @@
{{if .CanBeForked}}
- + {{$.i18n.Tr "repo.fork"}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 2bbb81bb5..d3f9f710c 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -8,8 +8,8 @@
- - + +
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 2bb404093..88f66ef9a 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -79,7 +79,7 @@ {{end}}
{{end}} - {{if or $.IsRepositoryAdmin (eq .Poster.ID $.SignedUserID)}} + {{if or $.IsRepositoryAdmin (eq .Poster.ID $.LoggedUserID)}}
@@ -216,10 +216,10 @@
{{end}} - {{if .IsSigned}} + {{if .IsLogged}}
- - + +
diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 608f0ca32..e10b07cdb 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -50,9 +50,9 @@
-
- - {{.SignedUser.ShortName 20}} +
+ + {{.LoggedUser.ShortName 20}}
{{range .Orgs}}
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index eda3d027e..f10c2aa82 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -19,12 +19,12 @@
-
- - {{.SignedUser.ShortName 20}} +
+ + {{.LoggedUser.ShortName 20}}
{{range .Orgs}} - {{if .IsOwnedBy $.SignedUser.ID}} + {{if .IsOwnedBy $.LoggedUser.ID}}
{{.ShortName 20}} diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 97df429f2..81d0fdf12 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -5,7 +5,7 @@
  • {{.i18n.Tr "repo.settings.options"}}
  • {{.i18n.Tr "repo.settings.collaboration"}}
  • {{.i18n.Tr "repo.settings.hooks"}}
    • - {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}} + {{if or .LoggedUser.AllowGitHook .LoggedUser.IsAdmin}}
  • {{.i18n.Tr "repo.settings.githooks"}}
    • {{end}}
  • {{.i18n.Tr "repo.settings.deploy_keys"}}
    • diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index f43b3caf6..9d3e33ca5 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -15,7 +15,7 @@ {{.i18n.Tr "repo.settings.hooks"}} - {{if .SignedUser.CanEditGitHook}} + {{if .LoggedUser.CanEditGitHook}} {{.i18n.Tr "repo.settings.githooks"}} diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 35fdc1baf..471d3fcda 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -15,7 +15,7 @@ {{else if .ResendLimited}}

    {{.i18n.Tr "auth.resent_limit_prompt"}}

    {{else}} -

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}

    +

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .LoggedUser.Email .Hours | Str2html}}

    {{end}} {{else}} {{if .IsSendRegisterMail}} @@ -23,7 +23,7 @@ {{else if .IsActivateFailed}}

    {{.i18n.Tr "auth.invalid_code"}}

    {{else}} -

    {{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}

    +

    {{.i18n.Tr "auth.has_unconfirmed_mail" .LoggedUser.Name .LoggedUser.Email | Str2html}}

    diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index d2600168f..88d69c8fb 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -10,9 +10,9 @@ {{.i18n.Tr "home.switch_dashboard_context"}}
    - - - {{.SignedUser.Name}} + + + {{.LoggedUser.Name}} {{range .Orgs}} diff --git a/templates/user/meta/header.tmpl b/templates/user/meta/header.tmpl index 36072e8aa..3d1fce03d 100644 --- a/templates/user/meta/header.tmpl +++ b/templates/user/meta/header.tmpl @@ -8,9 +8,9 @@
    {{if or $.PageIsFollowers $.PageIsFollowing}} - {{if and $.IsSigned (ne $.SignedUserName .Name)}} + {{if and $.IsLogged (ne $.LoggedUserName .Name)}}