Browse Source

Mirror fix on UI

Unknown 11 years ago
parent
commit
e10096ee2e
5 changed files with 8 additions and 4 deletions
  1. 2 1
      README.md
  2. 2 1
      README_ZH.md
  3. 1 0
      modules/middleware/repo.go
  4. 1 0
      routers/repo/issue.go
  5. 2 2
      templates/issue/view.tmpl

+ 2 - 1
README.md

@@ -52,11 +52,12 @@ More importantly, Gogs only needs one binary to setup your own project hosting o
 
 Make sure you install [Prerequirements](http://gogs.io/docs/installation/) first.
 
-There are 3 ways to install Gogs:
+There are 4 ways to install Gogs:
 
 - [Install from binary](http://gogs.io/docs/installation/install_from_binary.md): **STRONGLY RECOMMENDED**
 - [Install from source](http://gogs.io/docs/installation/install_from_source.md)
 - [Ship with Docker](https://github.com/gogits/gogs/tree/master/dockerfiles)
+- [Install with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
 
 ## Acknowledgments
 

+ 2 - 1
README_ZH.md

@@ -44,11 +44,12 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作,实现 **零** 依
 
 在安装 Gogs 之前,您需要先安装 [基本环境](http://gogs.io/docs/installation/)。
 
-然后,您可以通过以下 3 种方式来安装 Gogs:
+然后,您可以通过以下 4 种方式来安装 Gogs:
 
 - [二进制安装](http://gogs.io/docs/installation/install_from_binary.md): **强烈推荐**
 - [源码安装](http://gogs.io/docs/installation/install_from_source.md)
 - [采用 Docker 部署](https://github.com/gogits/gogs/tree/master/dockerfiles)
+- [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
 
 ## 特别鸣谢
 

+ 1 - 0
modules/middleware/repo.go

@@ -45,6 +45,7 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
 		repoName := params["reponame"]
 		refName := params["branchname"]
 
+		// TODO: check collaborators
 		// get repository owner
 		ctx.Repo.IsOwner = ctx.IsSigned && ctx.User.LowerName == strings.ToLower(userName)
 

+ 1 - 0
routers/repo/issue.go

@@ -252,6 +252,7 @@ func Comment(ctx *middleware.Context, params martini.Params) {
 		return
 	}
 
+	// TODO: check collaborators
 	// Check if issue owner changes the status of issue.
 	var newStatus string
 	if ctx.Repo.IsOwner || issue.PosterId == ctx.User.Id {

+ 2 - 2
templates/issue/view.tmpl

@@ -86,9 +86,9 @@
                             </div>
                             <div class="text-right">
                                 <div class="form-group">
-                                    {{if .Issue.IsClosed}}
+                                    {{if .IsIssueOwner}}{{if .Issue.IsClosed}}
                                     <input type="submit" class="btn-default btn issue-open" id="issue-open-btn" data-origin="Reopen" data-text="Reopen & Comment" name="change_status" value="Reopen"/>{{else}}
-                                    <input type="submit" class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment" name="change_status" value="Close"/>{{end}}&nbsp;&nbsp;
+                                    <input type="submit" class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment" name="change_status" value="Close"/>{{end}}{{end}}&nbsp;&nbsp;
                                     <button class="btn-success btn" id="issue-reply-btn">Comment</button>
                                 </div>
                             </div>