simon987/task_tracker
1
0
Fork 0
mirror of https://github.com/simon987/task_tracker.git synced 2025-04-16 00:46:47 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #4

Browse Source
This commit is contained in:
simon987 2019-03-10 11:35:26 -04:00
parent 59e202b2c8
commit df522f3557
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/project.go
View File

@ -143,13 +143,15 @@ func (database Database) GetAllProjects(managerId int64) *[]Project {
var err error var err error
if managerId == 0 { if managerId == 0 {
rows, err = db.Query(`SELECT 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 FROM project
WHERE NOT hidden WHERE NOT hidden
ORDER BY name`) ORDER BY name`)
} else { } else {
rows, err = db.Query(`SELECT 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 FROM project
LEFT JOIN manager_has_role_on_project mhrop ON mhrop.project = id AND mhrop.manager=$1 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) 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{} p := Project{}
err := rows.Scan(&p.Id, &p.Priority, &p.Name, &p.CloneUrl, err := rows.Scan(&p.Id, &p.Priority, &p.Name, &p.CloneUrl,
&p.GitRepo, &p.Version, &p.Motd, &p.Public, &p.Hidden, &p.GitRepo, &p.Version, &p.Motd, &p.Public, &p.Hidden,
&p.Chain, &p.Paused) &p.Chain, &p.Paused, &p.AssignRate, &p.SubmitRate)
handleErr(err) handleErr(err)
projects = append(projects, p) projects = append(projects, p)
} }