fix #273

6 files changed, 20 insertions, 6 deletions

diff --git a/gogs.go b/gogs.go
index df736647cd..7207baaade 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.4.5.0702 Alpha"
+const APP_VER = "0.4.5.0704 Alpha"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/user.go b/models/user.go
index d273d57f9f..b98e81babe 100644
--- a/models/user.go
+++ b/models/user.go
@@ -215,7 +215,7 @@ func CreateUser(u *User) (*User, error) {
 // GetUsers returns given number of user objects with offset.
 func GetUsers(num, offset int) ([]User, error) {
 	users := make([]User, 0, num)
-	err := x.Limit(num, offset).Asc("id").Find(&users)
+	err := x.Limit(num, offset).Where("type=0").Asc("id").Find(&users)
 	return users, err
 }
 
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index cf454bc8fb..5fe9ebc390 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -687,9 +687,17 @@ func Comment(ctx *middleware.Context, params martini.Params) {
 	}
 
 	// Notify watchers.
-	if err = models.NotifyWatchers(&models.Action{ActUserId: ctx.User.Id, ActUserName: ctx.User.Name, ActEmail: ctx.User.Email,
-		OpType: models.OP_COMMENT_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]),
-		RepoId: ctx.Repo.Repository.Id, RepoName: ctx.Repo.Repository.Name, RefName: ""}); err != nil {
+	act := &models.Action{
+		ActUserId:    ctx.User.Id,
+		ActUserName:  ctx.User.LowerName,
+		ActEmail:     ctx.User.Email,
+		OpType:       models.OP_COMMENT_ISSUE,
+		Content:      fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]),
+		RepoId:       ctx.Repo.Repository.Id,
+		RepoUserName: ctx.Repo.Owner.LowerName,
+		RepoName:     ctx.Repo.Repository.LowerName,
+	}
+	if err = models.NotifyWatchers(act); err != nil {
 		ctx.Handle(500, "issue.CreateIssue(NotifyWatchers)", err)
 		return
 	}
diff --git a/templates/VERSION b/templates/VERSION
index 8777e13060..6237548bbc 100644
--- a/templates/VERSION
+++ b/templates/VERSION
@@ -1 +1 @@
-0.4.5.0702 Alpha
\ No newline at end of file
+0.4.5.0704 Alpha
\ No newline at end of file
diff --git a/templates/repo/issue/create.tmpl b/templates/repo/issue/create.tmpl
index 34cecc78bd..b548b1e749 100644
--- a/templates/repo/issue/create.tmpl
+++ b/templates/repo/issue/create.tmpl
@@ -15,6 +15,7 @@
                     <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.title}}" />
                 </div>
                 <div class="form-group panel-body">
+                    {{if .IsRepositoryOwner}}
                     <span><strong id="assigned" data-no-assigned="No one">No one</strong> will be assigned</span>
                     <input type="hidden" name="assigneeid" value="0" id="assignee"/>&nbsp;&nbsp;
                     <div style="display: inline-block;position: relative">
@@ -82,6 +83,7 @@
                         </div>
                     </div>
                 </div>
+                {{end}}
                 <div class="form-group panel-body">
                     <div class="md-help pull-right"><!-- todo help link -->
                         Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a>
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index ba1fe16b79..d95fba40d8 100644
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -119,6 +119,7 @@
 
             <div class="issue-bar col-md-2">
                 <div class="labels" data-ajax="{{.Issue.Index}}/label">
+                    {{if .IsRepositoryOwner}}
                     <div class="pull-right action">
                         <button class="btn btn-default btn-sm" data-toggle="dropdown">
                             <i class="fa fa-tags"></i>
@@ -136,6 +137,7 @@
                             </ul>
                         </div>
                     </div>
+                    {{end}}
                     <h4>Labels</h4>
                     {{if .Issue.Labels}}
                     {{range .Issue.Labels}}
@@ -147,6 +149,7 @@
                 </div>
                 <div class="milestone" data-milestone="{{.Milestone.Id}}" data-ajax="{{.Issue.Index}}/milestone">
                     <div class="pull-right action">
+                        {{if .IsRepositoryOwner}}
                         <button class="btn btn-default btn-sm" data-toggle="dropdown">
                             <i class="fa fa-check-square-o"></i>
                             <span class="caret"></span>
@@ -193,6 +196,7 @@
                                 </li>
                             </ul>
                         </div>
+                        {{end}}
                     </div>
                     <h4>Milestone</h4>
                     {{if .Milestone}}