worldcone/forgejo
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #300 from nuss-justin/issue/259

Browse source 
Fix issue #259. Allow links in the repository description
This commit is contained in:
无闻 2014-07-22 15:48:05 -04:00
parent 536f65b8ad 636a78fed1
commit 5bbd5be0ca
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
models/repo.go
View file

@ -8,9 +8,12 @@ import (
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"html"
"html/template"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
"regexp"
"runtime" "runtime"
"sort" "sort"
"strings" "strings"
@ -46,6 +49,10 @@ var (
LanguageIgns, Licenses []string LanguageIgns, Licenses []string
) )
var (
DescriptionPattern = regexp.MustCompile(`https?://\S+`)
)
// getAssetList returns corresponding asset list in 'conf'. // getAssetList returns corresponding asset list in 'conf'.
func getAssetList(prefix string) []string { func getAssetList(prefix string) []string {
assets := make([]string, 0, 15) assets := make([]string, 0, 15)
@ -145,6 +152,16 @@ func (repo *Repository) GetOwner() (err error) {
return err return err
} }
func (repo *Repository) DescriptionHtml() template.HTML {
sanitize := func(s string) string {
// TODO(nuss-justin): Improve sanitization. Strip all tags?
ss := html.EscapeString(s)
return fmt.Sprintf(`<a href="%s" target="_blank">%s</a>`, ss, ss)
}
return template.HTML(DescriptionPattern.ReplaceAllStringFunc(repo.Description, sanitize))
}
// IsRepositoryExist returns true if the repository with given name under user has already existed. // IsRepositoryExist returns true if the repository with given name under user has already existed.
func IsRepositoryExist(u *User, repoName string) (bool, error) { func IsRepositoryExist(u *User, repoName string) (bool, error) {
repo := Repository{OwnerId: u.Id} repo := Repository{OwnerId: u.Id}
@ -1000,4 +1017,4 @@ func IsWatching(uid, rid int64) bool {
func ForkRepository(repoName string, uid int64) { func ForkRepository(repoName string, uid int64) {
} }

2
templates/repo/nav.tmpl
View file

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="/{{.Owner.Name}}/{{.Repository.Name}}">{{.Repository.Name}}</a> {{if .Repository.IsPrivate}}<span class="label label-default">Private</span>{{else if .Repository.IsMirror}}<span class="label label-default">Mirror</span>{{end}}</h3> <h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="/{{.Owner.Name}}/{{.Repository.Name}}">{{.Repository.Name}}</a> {{if .Repository.IsPrivate}}<span class="label label-default">Private</span>{{else if .Repository.IsMirror}}<span class="label label-default">Mirror</span>{{end}}</h3>
<p class="desc">{{.Repository.Description}}{{if .Repository.Website}} <a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p> <p class="desc">{{.Repository.DescriptionHtml}}{{if .Repository.Website}} <a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p>
</div> </div>
<div class="col-md-5 actions text-right clone-group-btn"> <div class="col-md-5 actions text-right clone-group-btn">
{{if not .IsBareRepo}} {{if not .IsBareRepo}}