From df522f35578f3068f81a97f78658a00a03204804 Mon Sep 17 00:00:00 2001 From: simon987 Date: Sun, 10 Mar 2019 11:35:26 -0400 Subject: [PATCH] Fixes #4 --- storage/project.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/storage/project.go b/storage/project.go index 3382f39..57fb7bd 100644 --- a/storage/project.go +++ b/storage/project.go @@ -143,13 +143,15 @@ func (database Database) GetAllProjects(managerId int64) *[]Project { var err error if managerId == 0 { rows, err = db.Query(`SELECT - Id, priority, name, clone_url, git_repo, version, motd, public, hidden, COALESCE(chain,0), paused + Id, priority, name, clone_url, git_repo, version, motd, public, hidden, COALESCE(chain,0), paused, + assign_rate, submit_rate FROM project WHERE NOT hidden ORDER BY name`) } else { rows, err = db.Query(`SELECT - Id, priority, name, clone_url, git_repo, version, motd, public, hidden, COALESCE(chain,0), paused + Id, priority, name, clone_url, git_repo, version, motd, public, hidden, COALESCE(chain,0), paused, + assign_rate, submit_rate FROM project LEFT JOIN manager_has_role_on_project mhrop ON mhrop.project = id AND mhrop.manager=$1 WHERE NOT hidden OR mhrop.role & 1 = 1 OR (SELECT tracker_admin FROM manager WHERE id=$1) @@ -161,7 +163,7 @@ func (database Database) GetAllProjects(managerId int64) *[]Project { p := Project{} err := rows.Scan(&p.Id, &p.Priority, &p.Name, &p.CloneUrl, &p.GitRepo, &p.Version, &p.Motd, &p.Public, &p.Hidden, - &p.Chain, &p.Paused) + &p.Chain, &p.Paused, &p.AssignRate, &p.SubmitRate) handleErr(err) projects = append(projects, p) }