mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-14 01:35:55 +09:00
finish create issue with milestone and assignee
This commit is contained in:
Unknwon committed
1 parent
09a1b2a1f5
commit
75aff60c90
13 files changed
+275
-206
No files matched your search
@@ -376,6 +376,8 @@ issues.new.clear_milestone = Clear milestone
|
||||
issues.new.open_milestone = Open Milestones
|
||||
issues.new.closed_milestone = Closed Milestones
|
||||
issues.new.assignee = Assignee
|
||||
issues.new.clear_assignee = Clear assignee
|
||||
issues.new.no_assignee = No assignee
|
||||
issues.create = Create Issue
|
||||
issues.new_label = New Label
|
||||
issues.new_label_placeholder = Label name...
|
||||
|
||||
+132
-83
@@ -17,6 +17,7 @@ import (
|
||||
"github.com/Unknwon/com"
|
||||
"github.com/go-xorm/xorm"
|
||||
|
||||
"github.com/gogits/gogs/modules/base"
|
||||
"github.com/gogits/gogs/modules/log"
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
@@ -59,10 +60,23 @@ func (i *Issue) AfterSet(colName string, _ xorm.Cell) {
|
||||
var err error
|
||||
switch colName {
|
||||
case "milestone_id":
|
||||
if i.MilestoneID == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
i.Milestone, err = GetMilestoneByID(i.MilestoneID)
|
||||
if err != nil {
|
||||
log.Error(3, "GetMilestoneById: %v", err)
|
||||
}
|
||||
case "assignee_id":
|
||||
if i.AssigneeID == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
i.Assignee, err = GetUserByID(i.AssigneeID)
|
||||
if err != nil {
|
||||
log.Error(3, "GetUserByID: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,7 +134,7 @@ func (i *Issue) RemoveLabel(labelID int64) error {
|
||||
}
|
||||
|
||||
func (i *Issue) GetAssignee() (err error) {
|
||||
if i.AssigneeID == 0 {
|
||||
if i.AssigneeID == 0 || i.Assignee != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -145,7 +159,7 @@ func (i *Issue) AfterDelete() {
|
||||
}
|
||||
|
||||
// CreateIssue creates new issue with labels for repository.
|
||||
func NewIssue(issue *Issue, labelIDs []int64) (err error) {
|
||||
func NewIssue(repo *Repository, issue *Issue, labelIDs []int64) (err error) {
|
||||
sess := x.NewSession()
|
||||
defer sessionRelease(sess)
|
||||
if err = sess.Begin(); err != nil {
|
||||
@@ -170,6 +184,10 @@ func NewIssue(issue *Issue, labelIDs []int64) (err error) {
|
||||
}
|
||||
}
|
||||
|
||||
if err = newIssueUsers(sess, repo, issue); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return sess.Commit()
|
||||
}
|
||||
|
||||
@@ -221,7 +239,7 @@ func GetIssueById(id int64) (*Issue, error) {
|
||||
}
|
||||
|
||||
// Issues returns a list of issues by given conditions.
|
||||
func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, page int, isClosed, isMention bool, labelIds, sortType string) ([]*Issue, error) {
|
||||
func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, page int, isClosed, isMention bool, labels, sortType string) ([]*Issue, error) {
|
||||
sess := x.Limit(setting.IssuePagingNum, (page-1)*setting.IssuePagingNum)
|
||||
|
||||
if repoID > 0 {
|
||||
@@ -240,14 +258,6 @@ func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, page int, isCl
|
||||
sess.And("issue.milestone_id=?", milestoneID)
|
||||
}
|
||||
|
||||
if len(labelIds) > 0 {
|
||||
for _, label := range strings.Split(labelIds, ",") {
|
||||
if com.StrTo(label).MustInt() > 0 {
|
||||
sess.And("label_ids like ?", "%$"+label+"|%")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
switch sortType {
|
||||
case "oldest":
|
||||
sess.Asc("created")
|
||||
@@ -265,10 +275,26 @@ func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, page int, isCl
|
||||
sess.Desc("created")
|
||||
}
|
||||
|
||||
labelIDs := base.StringsToInt64s(strings.Split(labels, ","))
|
||||
if len(labelIDs) > 0 {
|
||||
validJoin := false
|
||||
queryStr := "issue.id=issue_label.issue_id"
|
||||
for _, id := range labelIDs {
|
||||
if id == 0 {
|
||||
continue
|
||||
}
|
||||
validJoin = true
|
||||
queryStr += " AND issue_label.label_id=" + com.ToStr(id)
|
||||
}
|
||||
if validJoin {
|
||||
sess.Join("INNER", "issue_label", queryStr)
|
||||
}
|
||||
}
|
||||
|
||||
if isMention {
|
||||
queryStr := "issue.id = issue_user.issue_id AND issue_user.is_mentioned=1"
|
||||
queryStr := "issue.id=issue_user.issue_id AND issue_user.is_mentioned=1"
|
||||
if uid > 0 {
|
||||
queryStr += " AND issue_user.uid = " + com.ToStr(uid)
|
||||
queryStr += " AND issue_user.uid=" + com.ToStr(uid)
|
||||
}
|
||||
sess.Join("INNER", "issue_user", queryStr)
|
||||
}
|
||||
@@ -299,11 +325,11 @@ func GetIssueCountByPoster(uid, rid int64, isClosed bool) int64 {
|
||||
|
||||
// IssueUser represents an issue-user relation.
|
||||
type IssueUser struct {
|
||||
Id int64
|
||||
Uid int64 `xorm:"INDEX"` // User ID.
|
||||
IssueId int64
|
||||
RepoId int64 `xorm:"INDEX"`
|
||||
MilestoneId int64
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
UID int64 `xorm:"uid INDEX"` // User ID.
|
||||
IssueID int64
|
||||
RepoID int64 `xorm:"INDEX"`
|
||||
MilestoneID int64
|
||||
IsRead bool
|
||||
IsAssigned bool
|
||||
IsMentioned bool
|
||||
@@ -312,59 +338,62 @@ type IssueUser struct {
|
||||
}
|
||||
|
||||
// FIXME: organization
|
||||
// NewIssueUserPairs adds new issue-user pairs for new issue of repository.
|
||||
func NewIssueUserPairs(repo *Repository, issue *Issue) error {
|
||||
users, err := repo.GetCollaborators()
|
||||
func newIssueUsers(e *xorm.Session, repo *Repository, issue *Issue) error {
|
||||
users, err := repo.GetAssignees()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
iu := &IssueUser{
|
||||
IssueId: issue.ID,
|
||||
RepoId: repo.ID,
|
||||
IssueID: issue.ID,
|
||||
RepoID: repo.ID,
|
||||
}
|
||||
|
||||
// Poster can be anyone.
|
||||
isNeedAddPoster := true
|
||||
for _, u := range users {
|
||||
iu.Id = 0
|
||||
iu.Uid = u.Id
|
||||
iu.IsPoster = iu.Uid == issue.PosterID
|
||||
iu.ID = 0
|
||||
iu.UID = u.Id
|
||||
iu.IsPoster = iu.UID == issue.PosterID
|
||||
if isNeedAddPoster && iu.IsPoster {
|
||||
isNeedAddPoster = false
|
||||
}
|
||||
iu.IsAssigned = iu.Uid == issue.AssigneeID
|
||||
if _, err = x.Insert(iu); err != nil {
|
||||
iu.IsAssigned = iu.UID == issue.AssigneeID
|
||||
if _, err = e.Insert(iu); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if isNeedAddPoster {
|
||||
iu.Id = 0
|
||||
iu.Uid = issue.PosterID
|
||||
iu.ID = 0
|
||||
iu.UID = issue.PosterID
|
||||
iu.IsPoster = true
|
||||
iu.IsAssigned = iu.Uid == issue.AssigneeID
|
||||
if _, err = x.Insert(iu); err != nil {
|
||||
if _, err = e.Insert(iu); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Add owner's as well.
|
||||
if repo.OwnerID != issue.PosterID {
|
||||
iu.Id = 0
|
||||
iu.Uid = repo.OwnerID
|
||||
iu.IsAssigned = iu.Uid == issue.AssigneeID
|
||||
if _, err = x.Insert(iu); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// NewIssueUsers adds new issue-user relations for new issue of repository.
|
||||
func NewIssueUsers(repo *Repository, issue *Issue) (err error) {
|
||||
sess := x.NewSession()
|
||||
defer sessionRelease(sess)
|
||||
if err = sess.Begin(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err = newIssueUsers(sess, repo, issue); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return sess.Commit()
|
||||
}
|
||||
|
||||
// PairsContains returns true when pairs list contains given issue.
|
||||
func PairsContains(ius []*IssueUser, issueId, uid int64) int {
|
||||
for i := range ius {
|
||||
if ius[i].IssueId == issueId &&
|
||||
ius[i].Uid == uid {
|
||||
if ius[i].IssueID == issueId &&
|
||||
ius[i].UID == uid {
|
||||
return i
|
||||
}
|
||||
}
|
||||
@@ -374,7 +403,7 @@ func PairsContains(ius []*IssueUser, issueId, uid int64) int {
|
||||
// GetIssueUserPairs returns issue-user pairs by given repository and user.
|
||||
func GetIssueUserPairs(rid, uid int64, isClosed bool) ([]*IssueUser, error) {
|
||||
ius := make([]*IssueUser, 0, 10)
|
||||
err := x.Where("is_closed=?", isClosed).Find(&ius, &IssueUser{RepoId: rid, Uid: uid})
|
||||
err := x.Where("is_closed=?", isClosed).Find(&ius, &IssueUser{RepoID: rid, UID: uid})
|
||||
return ius, err
|
||||
}
|
||||
|
||||
@@ -437,50 +466,58 @@ const (
|
||||
FM_MENTION
|
||||
)
|
||||
|
||||
func parseCountResult(results []map[string][]byte) int64 {
|
||||
if len(results) == 0 {
|
||||
return 0
|
||||
}
|
||||
for _, result := range results[0] {
|
||||
return com.StrTo(string(result)).MustInt64()
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// GetIssueStats returns issue statistic information by given conditions.
|
||||
func GetIssueStats(repoID, uid, labelID, milestoneID int64, isShowClosed bool, filterMode int) *IssueStats {
|
||||
stats := &IssueStats{}
|
||||
issue := new(Issue)
|
||||
// issue := new(Issue)
|
||||
|
||||
queryStr := "issue.repo_id=? AND issue.is_closed=?"
|
||||
queryStr := "SELECT COUNT(*) FROM `issue` "
|
||||
if labelID > 0 {
|
||||
queryStr += " AND issue.label_ids like '%$" + com.ToStr(labelID) + "|%'"
|
||||
queryStr += "INNER JOIN `issue_label` ON `issue`.id=`issue_label`.issue_id AND `issue_label`.label_id=" + com.ToStr(labelID)
|
||||
}
|
||||
|
||||
baseCond := " WHERE issue.repo_id=? AND issue.is_closed=?"
|
||||
if milestoneID > 0 {
|
||||
queryStr += " AND milestone_id=" + com.ToStr(milestoneID)
|
||||
baseCond += " AND issue.milestone_id=" + com.ToStr(milestoneID)
|
||||
}
|
||||
switch filterMode {
|
||||
case FM_ALL:
|
||||
stats.OpenCount, _ = x.Where(queryStr, repoID, false).Count(issue)
|
||||
stats.ClosedCount, _ = x.Where(queryStr, repoID, true).Count(issue)
|
||||
return stats
|
||||
resutls, _ := x.Query(queryStr+baseCond, repoID, false)
|
||||
stats.OpenCount = parseCountResult(resutls)
|
||||
resutls, _ = x.Query(queryStr+baseCond, repoID, true)
|
||||
stats.ClosedCount = parseCountResult(resutls)
|
||||
|
||||
case FM_ASSIGN:
|
||||
queryStr += " AND assignee_id=?"
|
||||
stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid).Count(issue)
|
||||
stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid).Count(issue)
|
||||
return stats
|
||||
baseCond += " AND assignee_id=?"
|
||||
resutls, _ := x.Query(queryStr+baseCond, repoID, false, uid)
|
||||
stats.OpenCount = parseCountResult(resutls)
|
||||
resutls, _ = x.Query(queryStr+baseCond, repoID, true, uid)
|
||||
stats.ClosedCount = parseCountResult(resutls)
|
||||
|
||||
case FM_CREATE:
|
||||
queryStr += " AND poster_id=?"
|
||||
stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid).Count(issue)
|
||||
stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid).Count(issue)
|
||||
return stats
|
||||
baseCond += " AND poster_id=?"
|
||||
resutls, _ := x.Query(queryStr+baseCond, repoID, false, uid)
|
||||
stats.OpenCount = parseCountResult(resutls)
|
||||
resutls, _ = x.Query(queryStr+baseCond, repoID, true, uid)
|
||||
stats.ClosedCount = parseCountResult(resutls)
|
||||
|
||||
case FM_MENTION:
|
||||
queryStr += " AND uid=? AND is_mentioned=?"
|
||||
if labelID > 0 {
|
||||
stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid, true).
|
||||
Join("INNER", "issue", "issue.id = issue_id").Count(new(IssueUser))
|
||||
stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid, true).
|
||||
Join("INNER", "issue", "issue.id = issue_id").Count(new(IssueUser))
|
||||
return stats
|
||||
}
|
||||
|
||||
queryStr = strings.Replace(queryStr, "issue.", "", 2)
|
||||
stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid, true).Count(new(IssueUser))
|
||||
stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid, true).Count(new(IssueUser))
|
||||
return stats
|
||||
queryStr += " INNER JOIN `issue_user` ON `issue`.id=`issue_user`.issue_id"
|
||||
baseCond += " AND `issue_user`.uid=? AND `issue_user`.is_mentioned=?"
|
||||
resutls, _ := x.Query(queryStr+baseCond, repoID, false, uid, true)
|
||||
stats.OpenCount = parseCountResult(resutls)
|
||||
resutls, _ = x.Query(queryStr+baseCond, repoID, true, uid, true)
|
||||
stats.ClosedCount = parseCountResult(resutls)
|
||||
}
|
||||
return stats
|
||||
}
|
||||
@@ -511,22 +548,34 @@ func UpdateIssueUserPairsByStatus(iid int64, isClosed bool) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// UpdateIssueUserPairByAssignee updates issue-user pair for assigning.
|
||||
func UpdateIssueUserPairByAssignee(aid, iid int64) error {
|
||||
rawSql := "UPDATE `issue_user` SET is_assigned = ? WHERE issue_id = ?"
|
||||
if _, err := x.Exec(rawSql, false, iid); err != nil {
|
||||
func updateIssueUserByAssignee(e *xorm.Session, issueID, assigneeID int64) (err error) {
|
||||
if _, err = e.Exec("UPDATE `issue_user` SET is_assigned=? WHERE issue_id=?", false, issueID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Assignee ID equals to 0 means clear assignee.
|
||||
if aid == 0 {
|
||||
if assigneeID == 0 {
|
||||
return nil
|
||||
}
|
||||
rawSql = "UPDATE `issue_user` SET is_assigned = ? WHERE uid = ? AND issue_id = ?"
|
||||
_, err := x.Exec(rawSql, true, aid, iid)
|
||||
_, err = e.Exec("UPDATE `issue_user` SET is_assigned=? WHERE uid=? AND issue_id=?", true, assigneeID, issueID)
|
||||
return err
|
||||
}
|
||||
|
||||
// UpdateIssueUserByAssignee updates issue-user relation for assignee.
|
||||
func UpdateIssueUserByAssignee(issueID, assigneeID int64) (err error) {
|
||||
sess := x.NewSession()
|
||||
defer sessionRelease(sess)
|
||||
if err = sess.Begin(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err = updateIssueUserByAssignee(sess, issueID, assigneeID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return sess.Commit()
|
||||
}
|
||||
|
||||
// UpdateIssueUserPairByRead updates issue-user pair for reading.
|
||||
func UpdateIssueUserPairByRead(uid, iid int64) error {
|
||||
rawSql := "UPDATE `issue_user` SET is_read = ? WHERE uid = ? AND issue_id = ?"
|
||||
@@ -537,7 +586,7 @@ func UpdateIssueUserPairByRead(uid, iid int64) error {
|
||||
// UpdateIssueUserPairsByMentions updates issue-user pairs by mentioning.
|
||||
func UpdateIssueUserPairsByMentions(uids []int64, iid int64) error {
|
||||
for _, uid := range uids {
|
||||
iu := &IssueUser{Uid: uid, IssueId: iid}
|
||||
iu := &IssueUser{UID: uid, IssueID: iid}
|
||||
has, err := x.Get(iu)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -545,7 +594,7 @@ func UpdateIssueUserPairsByMentions(uids []int64, iid int64) error {
|
||||
|
||||
iu.IsMentioned = true
|
||||
if has {
|
||||
_, err = x.Id(iu.Id).AllCols().Update(iu)
|
||||
_, err = x.Id(iu.ID).AllCols().Update(iu)
|
||||
} else {
|
||||
_, err = x.Insert(iu)
|
||||
}
|
||||
|
||||
+38
-1
@@ -177,6 +177,43 @@ func (repo *Repository) GetOwner() (err error) {
|
||||
return repo.getOwner(x)
|
||||
}
|
||||
|
||||
// GetAssignees returns all users that have write access of repository.
|
||||
func (repo *Repository) GetAssignees() (_ []*User, err error) {
|
||||
if err = repo.GetOwner(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
accesses := make([]*Access, 0, 10)
|
||||
if err = x.Where("repo_id=? AND mode>=?", repo.ID, ACCESS_MODE_WRITE).Find(&accesses); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
users := make([]*User, 0, len(accesses)+1) // Just waste 1 unit does not matter.
|
||||
if !repo.Owner.IsOrganization() {
|
||||
users = append(users, repo.Owner)
|
||||
}
|
||||
|
||||
var u *User
|
||||
for i := range accesses {
|
||||
u, err = GetUserByID(accesses[i].UserID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
users = append(users, u)
|
||||
}
|
||||
return users, nil
|
||||
}
|
||||
|
||||
// GetAssigneeByID returns the user that has write access of repository by given ID.
|
||||
func (repo *Repository) GetAssigneeByID(userID int64) (*User, error) {
|
||||
return GetAssigneeByID(repo, userID)
|
||||
}
|
||||
|
||||
// GetMilestoneByID returns the milestone belongs to repository by given ID.
|
||||
func (repo *Repository) GetMilestoneByID(milestoneID int64) (*Milestone, error) {
|
||||
return GetRepoMilestoneByID(repo.ID, milestoneID)
|
||||
}
|
||||
|
||||
func (repo *Repository) GetMirror() (err error) {
|
||||
repo.Mirror, err = GetMirror(repo.ID)
|
||||
return err
|
||||
@@ -876,7 +913,7 @@ func DeleteRepository(uid, repoID int64, userName string) error {
|
||||
return err
|
||||
} else if _, err = sess.Delete(&Mirror{RepoID: repoID}); err != nil {
|
||||
return err
|
||||
} else if _, err = sess.Delete(&IssueUser{RepoId: repoID}); err != nil {
|
||||
} else if _, err = sess.Delete(&IssueUser{RepoID: repoID}); err != nil {
|
||||
return err
|
||||
} else if _, err = sess.Delete(&Milestone{RepoID: repoID}); err != nil {
|
||||
return err
|
||||
|
||||
@@ -602,6 +602,17 @@ func GetUserByID(id int64) (*User, error) {
|
||||
return getUserByID(x, id)
|
||||
}
|
||||
|
||||
// GetAssigneeByID returns the user with write access of repository by given ID.
|
||||
func GetAssigneeByID(repo *Repository, userID int64) (*User, error) {
|
||||
has, err := HasAccess(&User{Id: userID}, repo, ACCESS_MODE_WRITE)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
} else if !has {
|
||||
return nil, ErrUserNotExist{userID, ""}
|
||||
}
|
||||
return GetUserByID(userID)
|
||||
}
|
||||
|
||||
// GetUserByName returns user by given name.
|
||||
func GetUserByName(name string) (*User, error) {
|
||||
if len(name) == 0 {
|
||||
|
||||
@@ -772,7 +772,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
|
||||
return a, nil
|
||||
}
|
||||
|
||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xeb\x92\xdc\x46\xae\xe6\x7f\x3e\x05\xad\x0d\xad\xec\x88\x56\x29\x6c\xc7\x5e\xc2\x21\xc9\xdb\xee\xb6\x2e\x73\xd4\x6a\x1d\x75\x6b\x66\x67\x15\x0a\x0e\xab\xc8\xae\xe2\xa8\x8a\x2c\xf3\xd2\xe5\x9e\x5f\xfb\x1a\xfb\x7a\xfb\x24\x0b\x7c\x00\xf2\x42\xb2\x5a\xf2\x9c\x13\x7b\xfe\x54\x25\x33\x91\x37\x24\x12\x09\x20\x91\x99\xf9\x7e\x9f\x15\x65\xb7\x4a\x9f\xa5\xa7\xe9\x3e\xaf\xea\x6d\xd9\x75\x69\x57\x6e\x6f\x1e\x6f\x9a\xae\x2f\x8b\xf4\x65\xd5\xd3\x77\x7b\x5b\xad\xca\x24\xd9\x34\xbb\x92\x40\x5f\xd1\x5f\x52\xe4\xdd\x66\xd9\xe4\x6d\x41\x11\xe7\x16\x4e\xca\xdf\xf7\xdb\xa6\x65\xa0\x5f\x25\x94\x6c\xca\xed\x9e\xf3\xd0\x5f\xd2\x55\xeb\x3a\xab\x6a\xfa\xbc\xa2\x50\xfa\xba\x4e\xba\x66\x55\xe5\xdb\x2c\x48\x40\x84\xa5\xff\x94\xfe\x50\x17\xe9\x55\x5f\xee\xd3\xa7\xdd\x2e\xdf\x6e\x9f\xe7\x1d\xb2\xf4\x65\x9a\xaf\x56\xcd\x50\xf7\x4f\x9f\x48\x82\x14\xde\x0c\xbd\x95\x7e\x39\xf4\x12\x37\xec\x2d\xea\xc3\x3e\x69\xcb\x75\x45\x1d\x6b\x29\xea\xbd\x06\x93\x43\xb9\xec\xaa\x9e\x1b\xfd\x17\x09\x25\xb7\x65\xdb\x55\x0d\xb7\xe7\xcf\x12\x4a\xf6\xf9\x9a\x01\xde\xd1\x5f\xd2\x97\xbb\xfd\x36\x47\x86\x6b\x0d\x26\xdb\xbc\x5e\x0f\x02\xf3\x46\x83\x49\x32\x10\xe6\xea\x1c\x38\xfb\xa0\xc1\xa4\xdc\xe5\xd5\x96\xf1\xf3\x98\x03\x54\x6e\xd7\x1d\x1a\x60\xf1\x9d\x06\xa9\x8d\x59\x7f\xb7\x2f\xd1\xc4\xc7\xd7\x14\x4a\x56\xf9\xbe\x5f\x6d\x72\x8a\x39\x93\x50\x42\x40\xfb\x86\xda\xda\xb4\x77\x80\xb3\x8f\xa4\x69\xd7\x79\x5d\xfd\x23\xef\xa5\xfd\x97\xc1\x67\xb2\xab\xda\xb6\xe1\xae\x5f\x20\x90\xd4\xe5\x21\xe3\x72\x28\xe6\x6d\x79\x08\x4b\xe1\x94\x5d\xb5\x6e\xa5\x97\x9c\x78\x81\x2f\x2e\x85\xd3\x6e\x9a\xf6\xb3\x26\xbc\xe0\xe0\x28\x2b\x35\x42\x53\xe3\xfa\xf3\x9a\xf0\xa2\xa9\x17\xf8\x88\x00\xba\x24\x2f\x76\x55\x9d\xed\xf3\xba\x64\x1c\x9d\xf2\x17\xe1\x85\xbe\x12\x1d\xee\xac\x2b\xfb\xbe\xaa\xd7\x1d\x27\x4b\x54\x7a\xa5\x51\x49\x90\xe6\xe2\xb8\x3d\x5d\x76\x53\x96\x85\xb4\xa8\x4b\x5f\x50\x38\xd9\x0f\xdb\x2d\xf5\xfd\xb7\xa1\xec\x7a\x86\x7f\x47\xdf\xd4\x0b\xf9\x4e\xaa\xae\xa3\x00\x45\xbf\x46\x20\xa1\x01\xa8\x57\x68\xd2\x19\x02\x49\xf2\xb1\x2b\xf3\x76\xb5\xf9\x94\xc8\x3f\x6a\xe4\xc0\x62\xb1\x38\x3a\x34\x4c\x0e\x4a\x0a\x52\x83\x55\x90\xac\x9a\x82\x3f\xce\xe8\x8f\x8a\xae\xea\xae\x27\x92\xfe\x94\x68\x80\xc1\x24\x24\x68\xec\xab\x7e\x5b\xfa\x48\xcc\x8f\x8e\xc7\x21\x7d\x51\xb5\x5d\xff\xb8\xaf\x88\xe4\xde\x0f\x75\xc2\xfd\x23\x72\xce\x8a\xa5\xcd\xf2\x97\x0d\x61\x07\xd1\x2d\xf5\xef\xe2\xee\xea\x5f\xdf\x9c\xa4\xef\x68\xaa\xaf\xdb\x92\xc2\x29\x95\x41\x7f\x94\xe7\xc7\x45\x42\xb9\xac\xa6\xf3\xbc\xcf\x97\x79\x57\x7a\xb4\x72\xa2\xd0\xa8\x4b\x03\xa5\x32\xdb\x00\x8b\xe8\xfa\xa8\xbf\x73\x74\x4e\x65\xe8\xec\x70\x65\xbc\xe5\x29\x42\xf1\xcc\x35\x90\xf9\xdd\xb6\xe4\x78\x2a\x2a\x7d\xfd\xf6\xed\xe5\xf9\x2f\x69\x59\xaf\xab\xba\x4c\x0f\x55\xbf\x49\x87\xfe\xe6\xbf\x67\xeb\xb2\x2e\x5b\x62\x22\xab\x2a\xa5\x99\xd1\x12\x11\xa4\x44\x9e\xd2\xb9\x45\xd2\x75\xdb\x6c\x27\xe8\xbd\xba\x7a\x93\x5e\x30\x8a\xf7\x79\xbf\x41\x43\xfa\x4d\xd2\xfd\xb6\x65\x14\xb9\x0a\xaf\x37\x65\x7a\x53\x51\xaf\x01\xd4\xdc\x18\x3e\xd2\x42\xdb\xb8\x48\xca\xb6\xcd\x68\xde\xf7\x77\x99\x66\xd6\xf2\xc6\x90\x52\x04\x91\x4e\xdd\xf4\xe9\xb2\x4c\x91\x67\x91\x24\xd6\x60\xc3\xee\xe9\x7e\xbf\xad\x56\x32\x63\x5f\x4a\x9a\x47\x34\xb3\x68\xc5\x52\x08\x07\x44\x59\x5a\x80\x2e\xe2\x7f\x77\xcd\xd0\xa6\x11\x1b\x40\xfe\x4d\x49\x7c\x79\x33\xd0\x94\xcb\x89\xa7\x6e\x9b\xa1\xf8\x06\x94\x6a\xad\xf7\x84\x9a\xbe\x6f\xa8\xc1\xc0\x8e\x03\xf0\x55\x9c\x12\xc5\xf1\xaa\xd0\x96\xbb\x86\xb8\x83\x23\xf6\x8a\x08\xea\x50\x51\x22\xf5\xb4\xcb\x6f\x69\xbe\xf5\x4d\xda\x6f\xaa\x2e\x2d\x88\xd8\x56\x5c\x30\x4d\x8d\x81\xf8\xb1\x90\x05\x11\xa8\x90\x86\xc5\xc5\x63\x00\xa8\xdd\x40\xd4\xb4\xa1\xc2\x98\xdb\xf3\xd2\x44\x45\xce\xb5\x13\x5d\xa2\x72\x40\xdf\x44\xb9\x0d\xf1\x56\xe6\x7e\xe7\x08\xe8\x77\x58\x3e\xb5\x2a\xbf\xb9\xa1\x56\x75\x44\x15\xaf\xd2\xd5\xb6\x21\x92\xfa\xf0\xfe\x0d\x65\xde\xf4\xfd\x3e\xdb\x37\x2d\xc8\xf8\xfa\xfa\x1d\x4d\x8f\xb6\xf7\xb1\x01\xae\x19\xa6\x1e\x76\x4b\xfa\x3a\x6c\x2a\x62\x02\x79\x30\x40\x40\xc5\x96\x17\x98\x3a\x6d\xea\x05\xc6\x6a\x68\xb7\xa3\x61\xa4\x2a\x2d\xe5\x48\xf3\xb8\x09\x4f\xf8\xe7\xca\xb7\x12\xdd\xed\x68\x15\x3e\x60\x50\xa9\xab\x25\x56\x13\xa2\xad\x66\xcf\xe5\x06\xc4\x75\xa9\x11\x9e\xa2\xb0\x02\xb9\x74\x59\x87\x28\x15\x6b\x7c\xc0\x4b\x77\xd4\x61\x9d\xcd\x57\x17\x84\x06\x4c\x69\xc4\xde\xb4\xcd\x8e\x62\x5f\xd0\x9f\x8f\xf0\xcd\xbf\xe0\xf2\x00\x93\x17\x05\xb1\x99\xee\x24\x7d\xff\xe2\x2c\xfd\x2f\x3f\xfe\xf0\xc3\x22\x7d\xdd\xf3\x84\x60\x1a\xf9\x3b\x8f\x2d\x05\x65\x41\x74\xa0\x34\x73\x7b\x1a\xfe\x07\x4c\xe0\x0f\xd2\xa7\x48\xfd\x1f\xe5\xef\x39\xad\xb3\xe5\x62\xd5\xec\x9e\xf3\xe4\xde\xe5\xfd\x22\xe1\x14\xa2\x1a\x25\xa7\xab\xb2\x2e\x28\xa0\xcb\xaa\xa6\x05\x5c\x47\xd3\x83\x45\x56\x56\xff\x6c\xd5\xd4\x37\x55\xcb\x1d\xfa\xb5\xce\x97\x84\x13\x93\x0b\x88\x1d\x23\xc5\xd6\x2e\x42\x1a\x4d\xe4\xea\xe6\xce\x83\xa2\xab\x6f\x39\x52\x07\x34\x61\x59\x89\x0a\x55\x91\xc9\x61\xf9\x0a\xd1\x18\xb7\x4b\xea\x5e\x6b\xf8\xee\x3c\xc2\x9b\x9b\x9b\x2d\x31\x36\x63\x56\x5a\xc3\xa5\xc4\x0a\xdf\x0a\x41\x88\x18\xf7\x90\x6c\xce\xaLine truncated
|
||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xeb\x92\xdc\x46\xae\xe6\x7f\x3e\x05\xad\x0d\xad\xec\x88\x56\x29\x6c\xc7\x5e\xc2\x21\xc9\xdb\xee\xb6\x2e\x73\xd4\x6a\x1d\x75\x6b\x66\x67\x15\x0a\x0e\xab\xc8\xae\xe2\xa8\x8a\x2c\xf3\xd2\xe5\x9e\x5f\xfb\x1a\xfb\x7a\xfb\x24\x0b\x7c\x00\xf2\x42\xb2\x5a\xf2\x9c\x13\x7b\xfe\x54\x25\x33\x91\x37\x24\x12\x09\x20\x91\x99\xf9\x7e\x9f\x15\x65\xb7\x4a\x9f\xa5\xa7\xe9\x3e\xaf\xea\x6d\xd9\x75\x69\x57\x6e\x6f\x1e\x6f\x9a\xae\x2f\x8b\xf4\x65\xd5\xd3\x77\x7b\x5b\xad\xca\x24\xd9\x34\xbb\x92\x40\x5f\xd1\x5f\x52\xe4\xdd\x66\xd9\xe4\x6d\x41\x11\xe7\x16\x4e\xca\xdf\xf7\xdb\xa6\x65\xa0\x5f\x25\x94\x6c\xca\xed\x9e\xf3\xd0\x5f\xd2\x55\xeb\x3a\xab\x6a\xfa\xbc\xa2\x50\xfa\xba\x4e\xba\x66\x55\xe5\xdb\x2c\x48\x40\x84\xa5\xff\x94\xfe\x50\x17\xe9\x55\x5f\xee\xd3\xa7\xdd\x2e\xdf\x6e\x9f\xe7\x1d\xb2\xf4\x65\x9a\xaf\x56\xcd\x50\xf7\x4f\x9f\x48\x82\x14\xde\x0c\xbd\x95\x7e\x39\xf4\x12\x37\xec\x2d\xea\xc3\x3e\x69\xcb\x75\x45\x1d\x6b\x29\xea\xbd\x06\x93\x43\xb9\xec\xaa\x9e\x1b\xfd\x17\x09\x25\xb7\x65\xdb\x55\x0d\xb7\xe7\xcf\x12\x4a\xf6\xf9\x9a\x01\xde\xd1\x5f\xd2\x97\xbb\xfd\x36\x47\x86\x6b\x0d\x26\xdb\xbc\x5e\x0f\x02\xf3\x46\x83\x49\x32\x10\xe6\xea\x1c\x38\xfb\xa0\xc1\xa4\xdc\xe5\xd5\x96\xf1\xf3\x98\x03\x54\x6e\xd7\x1d\x1a\x60\xf1\x9d\x06\xa9\x8d\x59\x7f\xb7\x2f\xd1\xc4\xc7\xd7\x14\x4a\x56\xf9\xbe\x5f\x6d\x72\x8a\x39\x93\x50\x42\x40\xfb\x86\xda\xda\xb4\x77\x80\xb3\x8f\xa4\x69\xd7\x79\x5d\xfd\x23\xef\xa5\xfd\x97\xc1\x67\xb2\xab\xda\xb6\xe1\xae\x5f\x20\x90\xd4\xe5\x21\xe3\x72\x28\xe6\x6d\x79\x08\x4b\xe1\x94\x5d\xb5\x6e\xa5\x97\x9c\x78\x81\x2f\x2e\x85\xd3\x6e\x9a\xf6\xb3\x26\xbc\xe0\xe0\x28\x2b\x35\x42\x53\xe3\xfa\xf3\x9a\xf0\xa2\xa9\x17\xf8\x88\x00\xba\x24\x2f\x76\x55\x9d\xed\xf3\xba\x64\x1c\x9d\xf2\x17\xe1\x85\xbe\x12\x1d\xee\xac\x2b\xfb\xbe\xaa\xd7\x1d\x27\x4b\x54\x7a\xa5\x51\x49\x90\xe6\xe2\xb8\x3d\x5d\x76\x53\x96\x85\xb4\xa8\x4b\x5f\x50\x38\xd9\x0f\xdb\x2d\xf5\xfd\xb7\xa1\xec\x7a\x86\x7f\x47\xdf\xd4\x0b\xf9\x4e\xaa\xae\xa3\x00\x45\xbf\x46\x20\xa1\x01\xa8\x57\x68\xd2\x19\x02\x49\xf2\xb1\x2b\xf3\x76\xb5\xf9\x94\xc8\x3f\x6a\xe4\xc0\x62\xb1\x38\x3a\x34\x4c\x0e\x4a\x0a\x52\x83\x55\x90\xac\x9a\x82\x3f\xce\xe8\x8f\x8a\xae\xea\xae\x27\x92\xfe\x94\x68\x80\xc1\x24\x24\x68\xec\xab\x7e\x5b\xfa\x48\xcc\x8f\x8e\xc7\x21\x7d\x51\xb5\x5d\xff\xb8\xaf\x88\xe4\xde\x0f\x75\xc2\xfd\x23\x72\xce\x8a\xa5\xcd\xf2\x97\x0d\x61\x07\xd1\x2d\xf5\xef\xe2\xee\xea\x5f\xdf\x9c\xa4\xef\x68\xaa\xaf\xdb\x92\xc2\x29\x95\x41\x7f\x94\xe7\xc7\x45\x42\xb9\xac\xa6\xf3\xbc\xcf\x97\x79\x57\x7a\xb4\x72\xa2\xd0\xa8\x4b\x03\xa5\x32\xdb\x00\x8b\xe8\xfa\xa8\xbf\x73\x74\x4e\x65\xe8\xec\x70\x65\xbc\xe5\x29\x42\xf1\xcc\x35\x90\xf9\xdd\xb6\xe4\x78\x2a\x2a\x7d\xfd\xf6\xed\xe5\xf9\x2f\x69\x59\xaf\xab\xba\x4c\x0f\x55\xbf\x49\x87\xfe\xe6\xbf\x67\xeb\xb2\x2e\x5b\x62\x22\xab\x2a\xa5\x99\xd1\x12\x11\xa4\x44\x9e\xd2\xb9\x45\xd2\x75\xdb\x6c\x27\xe8\xbd\xba\x7a\x93\x5e\x30\x8a\xf7\x79\xbf\x41\x43\xfa\x4d\xd2\xfd\xb6\x65\x14\xb9\x0a\xaf\x37\x65\x7a\x53\x51\xaf\x01\xd4\xdc\x18\x3e\xd2\x42\xdb\xb8\x48\xca\xb6\xcd\x68\xde\xf7\x77\x99\x66\xd6\xf2\xc6\x90\x52\x04\x91\x4e\xdd\xf4\xe9\xb2\x4c\x91\x67\x91\x24\xd6\x60\xc3\xee\xe9\x7e\xbf\xad\x56\x32\x63\x5f\x4a\x9a\x47\x34\xb3\x68\xc5\x52\x08\x07\x44\x59\x5a\x80\x2e\xe2\x7f\x77\xcd\xd0\xa6\x11\x1b\x40\xfe\x4d\x49\x7c\x79\x33\xd0\x94\xcb\x89\xa7\x6e\x9b\xa1\xf8\x06\x94\x6a\xad\xf7\x84\x9a\xbe\x6f\xa8\xc1\xc0\x8e\x03\xf0\x55\x9c\x12\xc5\xf1\xaa\xd0\x96\xbb\x86\xb8\x83\x23\xf6\x8a\x08\xea\x50\x51\x22\xf5\xb4\xcb\x6f\x69\xbe\xf5\x4d\xda\x6f\xaa\x2e\x2d\x88\xd8\x56\x5c\x30\x4d\x8d\x81\xf8\xb1\x90\x05\x11\xa8\x90\x86\xc5\xc5\x63\x00\xa8\xdd\x40\xd4\xb4\xa1\xc2\x98\xdb\xf3\xd2\x44\x45\xce\xb5\x13\x5d\xa2\x72\x40\xdf\x44\xb9\x0d\xf1\x56\xe6\x7e\xe7\x08\xe8\x77\x58\x3e\xb5\x2a\xbf\xb9\xa1\x56\x75\x44\x15\xaf\xd2\xd5\xb6\x21\x92\xfa\xf0\xfe\x0d\x65\xde\xf4\xfd\x3e\xdb\x37\x2d\xc8\xf8\xfa\xfa\x1d\x4d\x8f\xb6\xf7\xb1\x01\xae\x19\xa6\x1e\x76\x4b\xfa\x3a\x6c\x2a\x62\x02\x79\x30\x40\x40\xc5\x96\x17\x98\x3a\x6d\xea\x05\xc6\x6a\x68\xb7\xa3\x61\xa4\x2a\x2d\xe5\x48\xf3\xb8\x09\x4f\xf8\xe7\xca\xb7\x12\xdd\xed\x68\x15\x3e\x60\x50\xa9\xab\x25\x56\x13\xa2\xad\x66\xcf\xe5\x06\xc4\x75\xa9\x11\x9e\xa2\xb0\x02\xb9\x74\x59\x87\x28\x15\x6b\x7c\xc0\x4b\x77\xd4\x61\x9d\xcd\x57\x17\x84\x06\x4c\x69\xc4\xde\xb4\xcd\x8e\x62\x5f\xd0\x9f\x8f\xf0\xcd\xbf\xe0\xf2\x00\x93\x17\x05\xb1\x99\xee\x24\x7d\xff\xe2\x2c\xfd\x2f\x3f\xfe\xf0\xc3\x22\x7d\xdd\xf3\x84\x60\x1a\xf9\x3b\x8f\x2d\x05\x65\x41\x74\xa0\x34\x73\x7b\x1a\xfe\x07\x4c\xe0\x0f\xd2\xa7\x48\xfd\x1f\xe5\xef\x39\xad\xb3\xe5\x62\xd5\xec\x9e\xf3\xe4\xde\xe5\xfd\x22\xe1\x14\xa2\x1a\x25\xa7\xab\xb2\x2e\x28\xa0\xcb\xaa\xa6\x05\x5c\x47\xd3\x83\x45\x56\x56\xff\x6c\xd5\xd4\x37\x55\xcb\x1d\xfa\xb5\xce\x97\x84\x13\x93\x0b\x88\x1d\x23\xc5\xd6\x2e\x42\x1a\x4d\xe4\xea\xe6\xce\x83\xa2\xab\x6f\x39\x52\x07\x34\x61\x59\x89\x0a\x55\x91\xc9\x61\xf9\x0a\xd1\x18\xb7\x4b\xea\x5e\x6b\xf8\xee\x3c\xc2\x9b\x9b\x9b\x2d\x31\x36\x63\x56\x5a\xc3\xa5\xc4\x0a\xdf\x0a\x41\x88\x18\xf7\x90\x6c\xce\xaLine truncated
|
||||
|
||||
func confLocaleLocale_enUsIniBytes() ([]byte, error) {
|
||||
return bindataRead(
|
||||
@@ -787,7 +787,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 36551, mode: os.FileMode(420), modTime: time.Unix(1439198919, 0)}
|
||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 36631, mode: os.FileMode(420), modTime: time.Unix(1439206636, 0)}
|
||||
a := &asset{bytes: bytes, info: info}
|
||||
return a, nil
|
||||
}
|
||||
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('embedded-opentype'),url(../fonts/octicons.woff?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('woff'),url(../fonts/octicons.ttf?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('truetype'),url(../fonts/octicons.svg?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6#octicons)format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-alignment-align:before{content:'\f08a'}.octicon-alignment-aligned-to:before{content:'\f08e'}.octicon-alignment-unalign:before{content:'\f08b'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beer:before{content:'\f069'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hourglass:before{content:'\f09e'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-jump-down:before{content:'\f072'}.octicon-jump-left:before{content:'\f0a5'}.octicon-jump-right:before{content:'\f0a6'}.octicon-jump-up:before{content:'\f073'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicoLine truncated
|
||||
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('embedded-opentype'),url(../fonts/octicons.woff?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('woff'),url(../fonts/octicons.ttf?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6)format('truetype'),url(../fonts/octicons.svg?v=345f8bad9c5003db196d08f05e7f030fd2a32ff6#octicons)format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-alignment-align:before{content:'\f08a'}.octicon-alignment-aligned-to:before{content:'\f08e'}.octicon-alignment-unalign:before{content:'\f08b'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beer:before{content:'\f069'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hourglass:before{content:'\f09e'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-jump-down:before{content:'\f072'}.octicon-jump-left:before{content:'\f0a5'}.octicon-jump-right:before{content:'\f0a6'}.octicon-jump-up:before{content:'\f073'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicoLine truncated
|
||||
+33
-20
@@ -65,29 +65,42 @@ function initCommentForm() {
|
||||
$($(this).parent().data('id')).val('');
|
||||
});
|
||||
|
||||
var $milestone_menu = $('.select-milestone .menu');
|
||||
var $milestone_list = $('.ui.select-milestone.list')
|
||||
// Milestones
|
||||
$milestone_menu.find('.item:not(.no-select)').click(function () {
|
||||
$(this).parent().find('.item').each(function () {
|
||||
$(this).removeClass('selected active')
|
||||
});
|
||||
function selectItem(select_id, input_id) {
|
||||
var $menu = $(select_id + ' .menu');
|
||||
var $list = $('.ui' + select_id + '.list')
|
||||
$menu.find('.item:not(.no-select)').click(function () {
|
||||
$(this).parent().find('.item').each(function () {
|
||||
$(this).removeClass('selected active')
|
||||
});
|
||||
|
||||
$(this).addClass('selected active');
|
||||
$milestone_list.find('.selected').html('<a class="item" href=' + $(this).data('href') + '>' +
|
||||
$(this).text() + '</a>');
|
||||
$('.ui.select-milestone.list .no-select').addClass('hide');
|
||||
$('#milestone_id').val($(this).data('id'));
|
||||
});
|
||||
$milestone_menu.find('.no-select.item').click(function () {
|
||||
$(this).parent().find('.item:not(.no-select)').each(function () {
|
||||
$(this).removeClass('selected active')
|
||||
$(this).addClass('selected active');
|
||||
switch (input_id) {
|
||||
case '#milestone_id':
|
||||
$list.find('.selected').html('<a class="item" href=' + $(this).data('href') + '>' +
|
||||
$(this).text() + '</a>');
|
||||
break;
|
||||
case '#assignee_id':
|
||||
$list.find('.selected').html('<a class="item" href=' + $(this).data('href') + '>' +
|
||||
'<img class="ui avatar image" src=' + $(this).data('avatar') + '>' +
|
||||
$(this).text() + '</a>');
|
||||
}
|
||||
$('.ui' + select_id + '.list .no-select').addClass('hide');
|
||||
$(input_id).val($(this).data('id'));
|
||||
});
|
||||
$menu.find('.no-select.item').click(function () {
|
||||
$(this).parent().find('.item:not(.no-select)').each(function () {
|
||||
$(this).removeClass('selected active')
|
||||
});
|
||||
|
||||
$milestone_list.find('.selected').html('');
|
||||
$milestone_list.find('.no-select').removeClass('hide');
|
||||
$('#milestone_id').val('');
|
||||
});
|
||||
$list.find('.selected').html('');
|
||||
$list.find('.no-select').removeClass('hide');
|
||||
$(input_id).val('');
|
||||
});
|
||||
}
|
||||
|
||||
// Milestone and assignee
|
||||
selectItem('.select-milestone', '#milestone_id');
|
||||
selectItem('.select-assignee', '#assignee_id');
|
||||
}
|
||||
|
||||
function initInstall() {
|
||||
|
||||
@@ -35,6 +35,9 @@
|
||||
overflow-x: auto;
|
||||
}
|
||||
.ui.list {
|
||||
.ui.avatar.image {
|
||||
border-radius: 0;
|
||||
}
|
||||
.hide {
|
||||
display: none!important;
|
||||
}
|
||||
@@ -109,6 +112,9 @@
|
||||
color: #000!important;
|
||||
}
|
||||
}
|
||||
.assignee {
|
||||
margin-top: -5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+26
-84
@@ -202,18 +202,13 @@ func NewIssue(ctx *middleware.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// ctx.Data["AssigneeID"] = 0
|
||||
// ctx.Data["Assignees"], err = repo.GetCollaborators()
|
||||
ctx.Data["Assignees"], err = repo.GetAssignees()
|
||||
if err != nil {
|
||||
ctx.Handle(500, "GetAssignees: %v", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// us, err := repo.GetCollaborators()
|
||||
// if err != nil {
|
||||
// ctx.Handle(500, "GetCollaborators", err)
|
||||
// return
|
||||
// }
|
||||
|
||||
// ctx.Data["Collaborators"] = us
|
||||
|
||||
ctx.HTML(200, ISSUE_NEW)
|
||||
}
|
||||
|
||||
@@ -227,6 +222,7 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
|
||||
repo = ctx.Repo.Repository
|
||||
labelIDs []int64
|
||||
milestoneID int64
|
||||
assigneeID int64
|
||||
)
|
||||
if ctx.User.IsAdmin {
|
||||
// Check labels.
|
||||
@@ -260,12 +256,26 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
|
||||
ctx.Handle(500, "GetMilestones: %v", err)
|
||||
return
|
||||
}
|
||||
ctx.Data["Milestone"], err = models.GetRepoMilestoneByID(repo.ID, milestoneID)
|
||||
ctx.Data["Milestone"], err = repo.GetMilestoneByID(milestoneID)
|
||||
if err != nil {
|
||||
ctx.Handle(500, "GetRepoMilestoneByID: %v", err)
|
||||
ctx.Handle(500, "GetMilestoneByID: %v", err)
|
||||
return
|
||||
}
|
||||
ctx.Data["milestone_id"] = milestoneID
|
||||
|
||||
// Check assignee.
|
||||
assigneeID = form.AssigneeID
|
||||
ctx.Data["Assignees"], err = repo.GetAssignees()
|
||||
if err != nil {
|
||||
ctx.Handle(500, "GetAssignees: %v", err)
|
||||
return
|
||||
}
|
||||
ctx.Data["Assignee"], err = repo.GetAssigneeByID(assigneeID)
|
||||
if err != nil {
|
||||
ctx.Handle(500, "GetAssigneeByID: %v", err)
|
||||
return
|
||||
}
|
||||
ctx.Data["assignee_id"] = assigneeID
|
||||
}
|
||||
|
||||
if ctx.HasError() {
|
||||
@@ -279,13 +289,10 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
|
||||
Name: form.Title,
|
||||
PosterID: ctx.User.Id,
|
||||
MilestoneID: milestoneID,
|
||||
// AssigneeID: form.AssigneeID,
|
||||
Content: form.Content,
|
||||
AssigneeID: assigneeID,
|
||||
Content: form.Content,
|
||||
}
|
||||
if err := models.NewIssue(issue, labelIDs); err != nil {
|
||||
ctx.Handle(500, "NewIssue", err)
|
||||
return
|
||||
} else if err := models.NewIssueUserPairs(repo, issue); err != nil {
|
||||
if err := models.NewIssue(repo, issue, labelIDs); err != nil {
|
||||
ctx.Handle(500, "NewIssue", err)
|
||||
return
|
||||
}
|
||||
@@ -294,71 +301,6 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
|
||||
}
|
||||
|
||||
func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
|
||||
// send := func(status int, data interface{}, err error) {
|
||||
// if err != nil {
|
||||
// log.Error(4, "issue.CreateIssuePost(?): %s", err)
|
||||
|
||||
// ctx.JSON(status, map[string]interface{}{
|
||||
// "ok": false,
|
||||
// "status": status,
|
||||
// "error": err.Error(),
|
||||
// })
|
||||
// } else {
|
||||
// ctx.JSON(status, map[string]interface{}{
|
||||
// "ok": true,
|
||||
// "status": status,
|
||||
// "data": data,
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
|
||||
// var err error
|
||||
// // Get all milestones.
|
||||
// _, err = models.GetMilestones(ctx.Repo.Repository.ID, -1, false)
|
||||
// if err != nil {
|
||||
// send(500, nil, err)
|
||||
// return
|
||||
// }
|
||||
// _, err = models.GetMilestones(ctx.Repo.Repository.ID, -1, true)
|
||||
// if err != nil {
|
||||
// send(500, nil, err)
|
||||
// return
|
||||
// }
|
||||
|
||||
// _, err = ctx.Repo.Repository.GetCollaborators()
|
||||
// if err != nil {
|
||||
// send(500, nil, err)
|
||||
// return
|
||||
// }
|
||||
|
||||
// if ctx.HasError() {
|
||||
// send(400, nil, errors.New(ctx.Flash.ErrorMsg))
|
||||
// return
|
||||
// }
|
||||
|
||||
// // Only collaborators can assign.
|
||||
// if !ctx.Repo.IsOwner() {
|
||||
// form.AssigneeId = 0
|
||||
// }
|
||||
// issue := &models.Issue{
|
||||
// RepoID: ctx.Repo.Repository.ID,
|
||||
// Index: int64(ctx.Repo.Repository.NumIssues) + 1,
|
||||
// Name: form.IssueName,
|
||||
// PosterID: ctx.User.Id,
|
||||
// MilestoneID: form.MilestoneId,
|
||||
// AssigneeID: form.AssigneeId,
|
||||
// LabelIds: form.Labels,
|
||||
// Content: form.Content,
|
||||
// }
|
||||
// if err := models.NewIssue(issue); err != nil {
|
||||
// send(500, nil, err)
|
||||
// return
|
||||
// } else if err := models.NewIssueUserPairs(ctx.Repo.Repository, issue.ID, ctx.Repo.Owner.Id,
|
||||
// ctx.User.Id, form.AssigneeId); err != nil {
|
||||
// send(500, nil, err)
|
||||
// return
|
||||
// }
|
||||
|
||||
// if setting.AttachmentEnabled {
|
||||
// uploadFiles(ctx, issue.ID, 0)
|
||||
// }
|
||||
@@ -743,7 +685,7 @@ func UpdateAssignee(ctx *middleware.Context) {
|
||||
aid := com.StrTo(ctx.Query("assigneeid")).MustInt64()
|
||||
// Not check for invalid assignee id and give responsibility to owners.
|
||||
issue.AssigneeID = aid
|
||||
if err = models.UpdateIssueUserPairByAssignee(aid, issue.ID); err != nil {
|
||||
if err = models.UpdateIssueUserByAssignee(issue.ID, aid); err != nil {
|
||||
ctx.Handle(500, "UpdateIssueUserPairByAssignee: %v", err)
|
||||
return
|
||||
} else if err = models.UpdateIssue(issue); err != nil {
|
||||
|
||||
@@ -339,13 +339,13 @@ func Issues(ctx *middleware.Context) {
|
||||
|
||||
issues := make([]*models.Issue, len(ius))
|
||||
for i := range ius {
|
||||
issues[i], err = models.GetIssueById(ius[i].IssueId)
|
||||
issues[i], err = models.GetIssueById(ius[i].IssueID)
|
||||
if err != nil {
|
||||
if err == models.ErrIssueNotExist {
|
||||
log.Warn("user.Issues(GetIssueById #%d): issue not exist", ius[i].IssueId)
|
||||
log.Warn("user.Issues(GetIssueById #%d): issue not exist", ius[i].IssueID)
|
||||
continue
|
||||
} else {
|
||||
ctx.Handle(500, fmt.Sprintf("user.Issues(GetIssueById #%d)", ius[i].IssueId), err)
|
||||
ctx.Handle(500, fmt.Sprintf("user.Issues(GetIssueById #%d)", ius[i].IssueID), err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,11 +87,14 @@
|
||||
<p class="desc">
|
||||
{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name|Str2html}}
|
||||
{{if .Milestone}}
|
||||
{{with .Milestone}}
|
||||
<a class="milestone" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}">
|
||||
<span class="octicon octicon-milestone"></span> {{.Name}}
|
||||
<a class="milestone" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}">
|
||||
<span class="octicon octicon-milestone"></span> {{.Milestone.Name}}
|
||||
</a>
|
||||
{{end}}
|
||||
{{if .Assignee}}
|
||||
<a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center">
|
||||
<img class="ui avatar image" src="{{.Assignee.AvatarLink}}">
|
||||
</a>
|
||||
{{end}}
|
||||
{{end}}
|
||||
</p>
|
||||
</li>
|
||||
|
||||
@@ -101,23 +101,29 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="ui divider"></div>
|
||||
<div class="ui divider"></div>
|
||||
|
||||
<div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item">
|
||||
<input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}">
|
||||
<div class="ui {{if not .Assignees}}disabled{{end}} jump select-assignee dropdown">
|
||||
<span class="text">
|
||||
<strong>{{.i18n.Tr "repo.issues.new.assignee"}}</strong>
|
||||
<span class="octicon octicon-gear"></span>
|
||||
</span>
|
||||
<div class="menu">
|
||||
<div class="item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</a>
|
||||
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div>
|
||||
{{range .Assignees}}
|
||||
<a class="item" href="#"><span class="octicon {{if eq .ID $.AssigneeID}}octicon-check{{end}}"></span> {{.Name}}</a>
|
||||
<div class="item" data-id="{{.Id}}" data-href="{{.HomeLink}}" data-avatar="{{.AvatarLink}}"><img src="{{.AvatarLink}}"> {{.Name}}</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui list">
|
||||
<span class="item">filter_label_no_select</span>
|
||||
</div> -->
|
||||
<div class="ui select-assignee list">
|
||||
<span class="no-select item {{if .Assignee}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignee"}}</span>
|
||||
<div class="selected">
|
||||
{{if .Assignee}}
|
||||
<a class="item" href="{{.Assignee.HomeLink}}"><img class="ui avatar image" src="{{.Assignee.AvatarLink}}"> {{.Assignee.Name}}</a>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<li><a href="{{AppSubUrl}}/issues?type=created_by&repoid={{.RepoId}}&state={{.State}}" class="radius{{if eq .ViewType "created_by"}} active{{end}}">Created by you <strong class="pull-right">{{.IssueStats.CreateCount}}</strong></a></li>
|
||||
<li><hr/></li>
|
||||
{{range .Repos}}
|
||||
<li><a href="{{AppSubUrl}}/issues?type={{$.ViewType}}{{if eq $.RepoId .Id}}{{else}}&repoid={{.Id}}{{end}}&state={{$.State}}" class="radius{{if eq $.RepoId .Id}} active{{end}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="pull-right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a></li>
|
||||
<li><a href="{{AppSubUrl}}/issues?type={{$.ViewType}}{{if eq $.RepoId .ID}}{{else}}&repoid={{.ID}}{{end}}&state={{$.State}}" class="radius{{if eq $.RepoId .ID}} active{{end}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="pull-right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a></li>
|
||||
{{end}}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user