diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | modules/base/tool.go | 24 | ||||
| -rw-r--r-- | modules/context/context.go | 11 | ||||
| -rw-r--r-- | modules/context/repo.go | 13 | ||||
| -rw-r--r-- | routers/repo/download.go | 6 | ||||
| -rw-r--r-- | routers/repo/editor.go | 3 | ||||
| -rw-r--r-- | routers/repo/issue.go | 6 | ||||
| -rw-r--r-- | routers/repo/view.go | 371 | ||||
| -rw-r--r-- | routers/user/setting.go | 2 | ||||
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/repo/home.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/view_file.tmpl | 12 | ||||
| -rw-r--r-- | templates/repo/view_list.tmpl | 16 |
13 files changed, 233 insertions, 241 deletions
@@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.94.0829" +const APP_VER = "0.9.94.0830" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/base/tool.go b/modules/base/tool.go index cf8fece027..e321d2b868 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -518,26 +518,14 @@ func IsLetter(ch rune) bool { return 'a' <= ch && ch <= 'z' || 'A' <= ch && ch <= 'Z' || ch == '_' || ch >= 0x80 && unicode.IsLetter(ch) } -func IsTextFile(data []byte) (string, bool) { - contentType := http.DetectContentType(data) - if strings.Index(contentType, "text/") != -1 { - return contentType, true - } - return contentType, false +func IsTextFile(data []byte) bool { + return strings.Index(http.DetectContentType(data), "text/") != -1 } -func IsImageFile(data []byte) (string, bool) { - contentType := http.DetectContentType(data) - if strings.Index(contentType, "image/") != -1 { - return contentType, true - } - return contentType, false +func IsImageFile(data []byte) bool { + return strings.Index(http.DetectContentType(data), "image/") != -1 } -func IsPDFFile(data []byte) (string, bool) { - contentType := http.DetectContentType(data) - if strings.Index(contentType, "application/pdf") != -1 { - return contentType, true - } - return contentType, false +func IsPDFFile(data []byte) bool { + return strings.Index(http.DetectContentType(data), "application/pdf") != -1 } diff --git a/modules/context/context.go b/modules/context/context.go index 971d075d0f..ac46bb38fb 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -105,13 +105,12 @@ func (ctx *Context) Handle(status int, title string, err error) { ctx.HTML(status, base.TplName(fmt.Sprintf("status/%d", status))) } -// HandleError use error check function to determine if server should -// response as client input error or server internal error. -// It responses with given status code for client error, -// or error context description for logging purpose of server error. -func (ctx *Context) HandleError(title string, errck func(error) bool, err error, status int) { +// NotFoundOrServerError use error check function to determine if the error +// is about not found. It responses with 404 status code for not found error, +// or error context description for logging purpose of 500 server error. +func (ctx *Context) NotFoundOrServerError(title string, errck func(error) bool, err error) { if errck(err) { - ctx.Error(status, err.Error()) + ctx.Handle(404, title, err) return } diff --git a/modules/context/repo.go b/modules/context/repo.go index f5f26b1e51..d72e64e42a 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -48,7 +48,7 @@ type Repository struct { CommitsCount int64 Mirror *models.Mirror - PullRequest *PullRequest + PullRequest *PullRequest } // IsOwner returns true if current user is the owner of repository. @@ -71,6 +71,11 @@ func (r *Repository) HasAccess() bool { return r.AccessMode >= models.ACCESS_MODE_READ } +// CanEnableEditor returns true if repository is editable and user has proper access level. +func (r *Repository) CanEnableEditor() bool { + return r.Repository.CanEnableEditor() && r.IsViewBranch && r.IsWriter() +} + // GetEditorconfig returns the .editorconfig definition if found in the // HEAD of the default repo branch. func (r *Repository) GetEditorconfig() (*editorconfig.Editorconfig, error) { @@ -167,6 +172,7 @@ func RepoAssignment(args ...bool) macaron.Handler { } } ctx.Repo.Owner = owner + ctx.Data["Username"] = ctx.Repo.Owner.Name // Get repository. repo, err := models.GetRepositoryByName(owner.ID, repoName) @@ -221,6 +227,7 @@ func RepoAssignment(args ...bool) macaron.Handler { } ctx.Repo.Repository = repo + ctx.Data["RepoName"] = ctx.Repo.Repository.Name ctx.Data["IsBareRepo"] = ctx.Repo.Repository.IsBare gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName)) @@ -348,12 +355,11 @@ func RepoRef() macaron.Handler { // For API calls. if ctx.Repo.GitRepo == nil { repoPath := models.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) - gitRepo, err := git.OpenRepository(repoPath) + ctx.Repo.GitRepo, err = git.OpenRepository(repoPath) if err != nil { ctx.Handle(500, "RepoRef Invalid repo "+repoPath, err) return } - ctx.Repo.GitRepo = gitRepo } // Get default branch. @@ -431,6 +437,7 @@ func RepoRef() macaron.Handler { ctx.Repo.BranchName = refName ctx.Data["BranchName"] = ctx.Repo.BranchName ctx.Data["CommitID"] = ctx.Repo.CommitID + ctx.Data["TreePath"] = ctx.Repo.TreePath ctx.Data["IsViewBranch"] = ctx.Repo.IsViewBranch ctx.Data["IsViewTag"] = ctx.Repo.IsViewTag ctx.Data["IsViewCommit"] = ctx.Repo.IsViewCommit diff --git a/routers/repo/download.go b/routers/repo/download.go index 85aa76472b..faa30ac9d7 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -21,10 +21,8 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error { buf = buf[:n] } - _, isTextFile := base.IsTextFile(buf) - if !isTextFile { - _, isImageFile := base.IsImageFile(buf) - if !isImageFile { + if !base.IsTextFile(buf) { + if !base.IsImageFile(buf) { ctx.Resp.Header().Set("Content-Disposition", "attachment; filename=\""+path.Base(ctx.Repo.TreePath)+"\"") ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary") } diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 81f95956a3..465de00214 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -72,8 +72,7 @@ func editFile(ctx *context.Context, isNewFile bool) { } // Only text file are editable online. - _, isTextFile := base.IsTextFile(buf) - if !isTextFile { + if !base.IsTextFile(buf) { ctx.Handle(404, "", nil) return } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 24fecaf415..a5908c182f 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -795,7 +795,7 @@ func UpdateIssueAssignee(ctx *context.Context) { func NewComment(ctx *context.Context, form auth.CreateCommentForm) { issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { - ctx.HandleError("GetIssueByIndex", models.IsErrIssueNotExist, err, 404) + ctx.NotFoundOrServerError("GetIssueByIndex", models.IsErrIssueNotExist, err) return } @@ -881,7 +881,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { func UpdateCommentContent(ctx *context.Context) { comment, err := models.GetCommentByID(ctx.ParamsInt64(":id")) if err != nil { - ctx.HandleError("GetCommentByID", models.IsErrCommentNotExist, err, 404) + ctx.NotFoundOrServerError("GetCommentByID", models.IsErrCommentNotExist, err) return } @@ -913,7 +913,7 @@ func UpdateCommentContent(ctx *context.Context) { func DeleteComment(ctx *context.Context) { comment, err := models.GetCommentByID(ctx.ParamsInt64(":id")) if err != nil { - ctx.HandleError("GetCommentByID", models.IsErrCommentNotExist, err, 404) + ctx.NotFoundOrServerError("GetCommentByID", models.IsErrCommentNotExist, err) return } diff --git a/routers/repo/view.go b/routers/repo/view.go index 50b158467a..42bf62c606 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -32,222 +32,224 @@ const ( FORKS base.TplName = "repo/forks" ) -func Home(ctx *context.Context) { - title := ctx.Repo.Repository.Owner.Name + "/" + ctx.Repo.Repository.Name - if len(ctx.Repo.Repository.Description) > 0 { - title += ": " + ctx.Repo.Repository.Description +func renderDirectory(ctx *context.Context, treeLink string) { + tree, err := ctx.Repo.Commit.SubTree(ctx.Repo.TreePath) + if err != nil { + ctx.NotFoundOrServerError("Repo.Commit.SubTree", git.IsErrNotExist, err) + return } - ctx.Data["Title"] = title - ctx.Data["PageIsViewCode"] = true - ctx.Data["RequireHighlightJS"] = true - - branchName := ctx.Repo.BranchName - userName := ctx.Repo.Owner.Name - repoName := ctx.Repo.Repository.Name - - branchLink := ctx.Repo.RepoLink + "/src/" + branchName - treeLink := branchLink - rawLink := ctx.Repo.RepoLink + "/raw/" + branchName - // uploadFileLink := ctx.Repo.RepoLink + "/upload/" + branchName - treePath := ctx.Repo.TreePath - if len(treePath) > 0 { - treeLink += "/" + treePath + entries, err := tree.ListEntries() + if err != nil { + ctx.Handle(500, "ListEntries", err) + return } + entries.Sort() - entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treePath) + ctx.Data["Files"], err = entries.GetCommitsInfo(ctx.Repo.Commit, ctx.Repo.TreePath) if err != nil { - if git.IsErrNotExist(err) { - ctx.Handle(404, "GetTreeEntryByPath", err) - } else { - ctx.Handle(500, "GetTreeEntryByPath", err) - } + ctx.Handle(500, "GetCommitsInfo", err) return } - if !entry.IsDir() { - blob := entry.Blob() - dataRc, err := blob.Data() + var readmeFile *git.Blob + for _, entry := range entries { + if entry.IsDir() || !markdown.IsReadmeFile(entry.Name()) { + continue + } + + // TODO: collect all possible README files and show with priority. + readmeFile = entry.Blob() + break + } + + if readmeFile != nil { + ctx.Data["ReadmeInList"] = true + ctx.Data["ReadmeExist"] = true + + dataRc, err := readmeFile.Data() if err != nil { - ctx.Handle(404, "blob.Data", err) + ctx.Handle(500, "Data", err) return } - ctx.Data["FileSize"] = blob.Size() - ctx.Data["IsFile"] = true - ctx.Data["FileName"] = blob.Name() - ctx.Data["HighlightClass"] = highlight.FileNameToHighlightClass(blob.Name()) - ctx.Data["FileLink"] = rawLink + "/" + treePath - buf := make([]byte, 1024) n, _ := dataRc.Read(buf) if n > 0 { buf = buf[:n] } - _, isTextFile := base.IsTextFile(buf) - _, isImageFile := base.IsImageFile(buf) - _, isPDFFile := base.IsPDFFile(buf) - ctx.Data["IsFileText"] = isTextFile - - // Assume file is not editable first. - if !isTextFile { - ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.cannot_edit_non_text_files") - } - - switch { - case isPDFFile: - ctx.Data["IsPDFFile"] = true - case isImageFile: - ctx.Data["IsImageFile"] = true - case isTextFile: - if blob.Size() >= setting.UI.MaxDisplayFileSize { - ctx.Data["IsFileTooLarge"] = true - } else { - d, _ := ioutil.ReadAll(dataRc) - buf = append(buf, d...) - - isMarkdown := markdown.IsMarkdownFile(blob.Name()) - ctx.Data["IsMarkdown"] = isMarkdown - - readmeExist := isMarkdown || markdown.IsReadmeFile(blob.Name()) - ctx.Data["ReadmeExist"] = readmeExist - if readmeExist { - // TODO: don't need to render if it's a README but not Markdown file. - ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas())) - } else { - // Building code view blocks with line number on server side. - var filecontent string - if err, content := template.ToUTF8WithErr(buf); err != nil { - if err != nil { - log.Error(4, "ToUTF8WithErr: %s", err) - } - filecontent = string(buf) - } else { - filecontent = content - } - - var output bytes.Buffer - lines := strings.Split(filecontent, "\n") - for index, line := range lines { - output.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, index+1, index+1, gotemplate.HTMLEscapeString(line)) + "\n") - } - ctx.Data["FileContent"] = gotemplate.HTML(output.String()) - - output.Reset() - for i := 0; i < len(lines); i++ { - output.WriteString(fmt.Sprintf(`<span id="L%d">%d</span>`, i+1, i+1)) - } - ctx.Data["LineNums"] = gotemplate.HTML(output.String()) - } - } - - if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch { - ctx.Data["CanEditFile"] = true - ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file") - } else if !ctx.Repo.IsViewBranch { - ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") - } else if !ctx.Repo.IsWriter() { - ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.fork_before_edit") + isTextFile := base.IsTextFile(buf) + ctx.Data["FileIsText"] = isTextFile + ctx.Data["FileName"] = readmeFile.Name() + // FIXME: what happens when README file is an image? + if isTextFile { + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) + switch { + case markdown.IsMarkdownFile(readmeFile.Name()): + ctx.Data["IsMarkdown"] = true + buf = markdown.Render(buf, treeLink, ctx.Repo.Repository.ComposeMetas()) + default: + buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1) } + ctx.Data["FileContent"] = string(buf) } + } - if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch { - ctx.Data["CanDeleteFile"] = true - ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") - } else if !ctx.Repo.IsViewBranch { - ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") - } else if !ctx.Repo.IsWriter() { - ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_have_write_access") - } - - } else { - // Directory and file list. - tree, err := ctx.Repo.Commit.SubTree(treePath) + // Show latest commit info of repository in table header, + // or of directory if not in root directory. + latestCommit := ctx.Repo.Commit + if len(ctx.Repo.TreePath) > 0 { + latestCommit, err = ctx.Repo.Commit.GetCommitByPath(ctx.Repo.TreePath) if err != nil { - ctx.Handle(404, "SubTree", err) + ctx.Handle(500, "GetCommitByPath", err) return } + } + ctx.Data["LatestCommit"] = latestCommit + ctx.Data["LatestCommitUser"] = models.ValidateCommitWithEmail(latestCommit) + + // Check permission to add or upload new file. + if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch { + ctx.Data["CanAddFile"] = true + // uploadFileLink := ctx.Repo.RepoLink + "/upload/" + branchName + // if setting.Repository.Upload.Enabled { + // ctx.Data["UploadFileLink"] = uploadFileLink + "/" + ctx.Repo.TreePath + // } + } +} - entries, err := tree.ListEntries() - if err != nil { - ctx.Handle(500, "ListEntries", err) - return - } - entries.Sort() +func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink string) { + ctx.Data["IsViewFile"] = true - ctx.Data["Files"], err = entries.GetCommitsInfo(ctx.Repo.Commit, treePath) - if err != nil { - ctx.Handle(500, "GetCommitsInfo", err) - return - } + blob := entry.Blob() + dataRc, err := blob.Data() + if err != nil { + ctx.Handle(500, "Data", err) + return + } - var readmeFile *git.Blob - for _, f := range entries { - if f.IsDir() || !markdown.IsReadmeFile(f.Name()) { - continue - } else { - readmeFile = f.Blob() - break - } + ctx.Data["FileSize"] = blob.Size() + ctx.Data["FileName"] = blob.Name() + ctx.Data["HighlightClass"] = highlight.FileNameToHighlightClass(blob.Name()) + ctx.Data["RawFileLink"] = rawLink + "/" + ctx.Repo.TreePath + + buf := make([]byte, 1024) + n, _ := dataRc.Read(buf) + if n > 0 { + buf = buf[:n] + } + + isTextFile := base.IsTextFile(buf) + ctx.Data["IsTextFile"] = isTextFile + + // Assume file is not editable first. + if !isTextFile { + ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.cannot_edit_non_text_files") + } + + switch { + case isTextFile: + if blob.Size() >= setting.UI.MaxDisplayFileSize { + ctx.Data["IsFileTooLarge"] = true + break } - if readmeFile != nil { - ctx.Data["ReadmeInList"] = true - ctx.Data["ReadmeExist"] = true - if dataRc, err := readmeFile.Data(); err != nil { - ctx.Handle(404, "repo.SinglereadmeFile.Data", err) - return - } else { + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) - buf := make([]byte, 1024) - n, _ := dataRc.Read(buf) - if n > 0 { - buf = buf[:n] - } + isMarkdown := markdown.IsMarkdownFile(blob.Name()) + ctx.Data["IsMarkdown"] = isMarkdown - ctx.Data["FileSize"] = readmeFile.Size() - ctx.Data["FileLink"] = rawLink + "/" + treePath - _, isTextFile := base.IsTextFile(buf) - ctx.Data["FileIsText"] = isTextFile - ctx.Data["FileName"] = readmeFile.Name() - if isTextFile { - d, _ := ioutil.ReadAll(dataRc) - buf = append(buf, d...) - switch { - case markdown.IsMarkdownFile(readmeFile.Name()): - ctx.Data["IsMarkdown"] = true - buf = markdown.Render(buf, treeLink, ctx.Repo.Repository.ComposeMetas()) - default: - buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1) - } - ctx.Data["FileContent"] = string(buf) + readmeExist := isMarkdown || markdown.IsReadmeFile(blob.Name()) + ctx.Data["ReadmeExist"] = readmeExist + if readmeExist { + // TODO: don't need to render if it's a README but not Markdown file. + ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas())) + } else { + // Building code view blocks with line number on server side. + var fileContent string + if err, content := template.ToUTF8WithErr(buf); err != nil { + if err != nil { + log.Error(4, "ToUTF8WithErr: %s", err) } + fileContent = string(buf) + } else { + fileContent = content } - } - lastCommit := ctx.Repo.Commit - if len(treePath) > 0 { - c, err := ctx.Repo.Commit.GetCommitByPath(treePath) - if err != nil { - ctx.Handle(500, "GetCommitByPath", err) - return + var output bytes.Buffer + lines := strings.Split(fileContent, "\n") + for index, line := range lines { + output.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, index+1, index+1, gotemplate.HTMLEscapeString(line)) + "\n") } - lastCommit = c + ctx.Data["FileContent"] = gotemplate.HTML(output.String()) + + output.Reset() + for i := 0; i < len(lines); i++ { + output.WriteString(fmt.Sprintf(`<span id="L%d">%d</span>`, i+1, i+1)) + } + ctx.Data["LineNums"] = gotemplate.HTML(output.String()) } - ctx.Data["LastCommit"] = lastCommit - ctx.Data["LastCommitUser"] = models.ValidateCommitWithEmail(lastCommit) - - if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch { - ctx.Data["CanAddFile"] = true - // if setting.Repository.Upload.Enabled { - // ctx.Data["UploadFileLink"] = uploadFileLink + "/" + treePath - // } + + if ctx.Repo.CanEnableEditor() { + ctx.Data["CanEditFile"] = true + ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file") + } else if !ctx.Repo.IsViewBranch { + ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") + } else if !ctx.Repo.IsWriter() { + ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.fork_before_edit") } + + case base.IsPDFFile(buf): + ctx.Data["IsPDFFile"] = true + case base.IsImageFile(buf): + ctx.Data["IsImageFile"] = true } - ctx.Data["Username"] = userName - ctx.Data["Reponame"] = repoName + if ctx.Repo.CanEnableEditor() { + ctx.Data["CanDeleteFile"] = true + ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") + } else if !ctx.Repo.IsViewBranch { + ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") + } else if !ctx.Repo.IsWriter() { + ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_have_write_access") + } +} + +func Home(ctx *context.Context) { + title := ctx.Repo.Repository.Owner.Name + "/" + ctx.Repo.Repository.Name + if len(ctx.Repo.Repository.Description) > 0 { + title += ": " + ctx.Repo.Repository.Description + } + ctx.Data["Title"] = title + ctx.Data["PageIsViewCode"] = true + ctx.Data["RequireHighlightJS"] = true + + branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchName + treeLink := branchLink + rawLink := ctx.Repo.RepoLink + "/raw/" + ctx.Repo.BranchName + + if len(ctx.Repo.TreePath) > 0 { + treeLink += "/" + ctx.Repo.TreePath + } + + // Get current entry user currently looking at. + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath) + if err != nil { + ctx.NotFoundOrServerError("Repo.Commit.GetTreeEntryByPath", git.IsErrNotExist, err) + return + } + + if entry.IsDir() { + renderDirectory(ctx, treeLink) + } else { + renderFile(ctx, entry, treeLink, rawLink) + } + if ctx.Written() { + return + } ec, err := ctx.Repo.GetEditorconfig() if err != nil && !git.IsErrNotExist(err) { @@ -255,13 +257,13 @@ func Home(ctx *context.Context) { return } ctx.Data["Editorconfig"] = ec - var treenames []string - paths := make([]string, 0) - if len(treePath) > 0 { - treenames = strings.Split(treePath, "/") - for i := range treenames { - paths = append(paths, strings.Join(treenames[0:i+1], "/")) + var treeNames []string + paths := make([]string, 0, 5) + if len(ctx.Repo.TreePath) > 0 { + treeNames = strings.Split(ctx.Repo.TreePath, "/") + for i := range treeNames { + paths = append(paths, strings.Join(treeNames[:i+1], "/")) } ctx.Data["HasParentPath"] = true @@ -271,9 +273,8 @@ func Home(ctx *context.Context) { } ctx.Data["Paths"] = paths - ctx.Data["TreePath"] = treePath ctx.Data["TreeLink"] = treeLink - ctx.Data["Treenames"] = treenames + ctx.Data["TreeNames"] = treeNames ctx.Data["BranchLink"] = branchLink ctx.HTML(200, HOME) } diff --git a/routers/user/setting.go b/routers/user/setting.go index c5441f3543..10e8fd02b6 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -121,7 +121,7 @@ func UpdateAvatarSetting(ctx *context.Context, form auth.AvatarForm, ctxUser *mo if err != nil { return fmt.Errorf("ioutil.ReadAll: %v", err) } - if _, ok := base.IsImageFile(data); !ok { + if !base.IsImageFile(data) { return errors.New(ctx.Tr("settings.uploaded_avatar_not_a_image")) } if err = ctxUser.UploadAvatar(data); err != nil { diff --git a/templates/.VERSION b/templates/.VERSION index 8e1e3e9848..bbf71e4218 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.94.0829
\ No newline at end of file +0.9.94.0830
\ No newline at end of file diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 7ef75277e6..2b8c7e06e0 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -19,9 +19,9 @@ <div class="fitted item"> <div class="ui breadcrumb"> <a class="section" href="{{.RepoLink}}/src/{{EscapePound .BranchName}}">{{.Repository.Name}}</a> - {{ $n := len .Treenames}} + {{ $n := len .TreeNames}} {{ $l := Subtract $n 1}} - {{range $i, $v := .Treenames}} + {{range $i, $v := .TreeNames}} <div class="divider"> / </div> {{if eq $i $l}} <span class="active section">{{$v}}</span> @@ -74,7 +74,7 @@ {{end}} </div> </div> - {{if .IsFile}} + {{if .IsViewFile}} {{template "repo/view_file" .}} {{else}} {{template "repo/view_list" .}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index d0b793b0e7..68e8444768 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -18,7 +18,7 @@ <a class="ui button" href="{{.RepoLink}}/src/{{.CommitID}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.file_permalink"}}</a> {{end}} <a class="ui button" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.file_history"}}</a> - <a class="ui button" href="{{EscapePound .FileLink}}">{{.i18n.Tr "repo.file_raw"}}</a> + <a class="ui button" href="{{EscapePound $.RawFileLink}}">{{.i18n.Tr "repo.file_raw"}}</a> </div> {{if .Repository.CanEnableEditor}} {{if .CanEditFile}} @@ -36,17 +36,17 @@ {{end}} </h4> <div class="ui attached table segment"> - <div class="file-view {{if .IsMarkdown}}markdown{{else if .IsFileText}}code-view{{end}} has-emoji"> + <div class="file-view {{if .IsMarkdown}}markdown{{else if .IsTextFile}}code-view{{end}} has-emoji"> {{if .IsMarkdown}} {{if .FileContent}}{{.FileContent | Str2html}}{{end}} - {{else if not .IsFileText}} + {{else if not .IsTextFile}} <div class="view-raw ui center"> {{if .IsImageFile}} - <img src="{{EscapePound .FileLink}}"> + <img src="{{EscapePound $.RawFileLink}}"> {{else if .IsPDFFile}} - <iframe width="100%" height="600px" src="{{AppSubUrl}}/plugins/pdfjs-1.4.20/web/viewer.html?file={{EscapePound .FileLink}}"></iframe> + <iframe width="100%" height="600px" src="{{AppSubUrl}}/plugins/pdfjs-1.4.20/web/viewer.html?file={{EscapePound $.RawFileLink}}"></iframe> {{else}} - <a href="{{EscapePound $.FileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.i18n.Tr "repo.file_view_raw"}}</a> + <a href="{{EscapePound $.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.i18n.Tr "repo.file_view_raw"}}</a> {{end}} </div> {{else if .FileSize}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index a92123b865..19a18c1ca4 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -2,19 +2,19 @@ <thead> <tr> <th class="four wide"> - {{if .LastCommitUser}} - <img class="ui avatar image img-12" src="{{.LastCommitUser.RelAvatarLink}}" /> - <a href="{{AppSubUrl}}/{{.LastCommitUser.Name}}"><strong>{{.LastCommit.Author.Name}}</strong></a> + {{if .LatestCommitUser}} + <img class="ui avatar image img-12" src="{{.LatestCommitUser.RelAvatarLink}}" /> + <a href="{{AppSubUrl}}/{{.LatestCommitUser.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></a> {{else}} - <img class="ui avatar image img-12" src="{{AvatarLink .LastCommit.Author.Email}}" /> - <strong>{{.LastCommit.Author.Name}}</strong> + <img class="ui avatar image img-12" src="{{AvatarLink .LatestCommit.Author.Email}}" /> + <strong>{{.LatestCommit.Author.Name}}</strong> {{end}} - <a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.LastCommit.ID}}" rel="nofollow">{{ShortSha .LastCommit.ID.String}}</a> - <span class="grey has-emoji">{{RenderCommitMessage false .LastCommit.Summary .RepoLink $.Repository.ComposeMetas}}</span> + <a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.LatestCommit.ID}}" rel="nofollow">{{ShortSha .LatestCommit.ID.String}}</a> + <span class="grey has-emoji">{{RenderCommitMessage false .LatestCommit.Summary .RepoLink $.Repository.ComposeMetas}}</span> </th> <th class="nine wide"> </th> - <th class="three wide text grey right age">{{TimeSince .LastCommit.Author.When $.Lang}}</th> + <th class="three wide text grey right age">{{TimeSince .LatestCommit.Author.When $.Lang}}</th> </tr> </thead> <tbody> |