diff --git a/newRepo.go b/newRepo.go index 6ac8e8b..f1cdedc 100644 --- a/newRepo.go +++ b/newRepo.go @@ -89,24 +89,8 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) { newRepo.currentName = r.reposgrid.NewLabel("") newRepo.currentVersion = r.reposgrid.NewLabel("") - r.reposgrid.NextRow() - newRepo.Status.InitOk = true - // newRepo.Hide() - return newRepo, nil -} -/* -func (r *RepoList) makeAutotypistView(newRepo *RepoRow) { - - newRepo.lastTag = grid.NewLabel("") - newRepo.masterVersion = grid.NewLabel("") - newRepo.develVersion = grid.NewLabel("") - newRepo.userVersion = grid.NewLabel("") - newRepo.gitState = grid.NewLabel("") - newRepo.currentName = grid.NewLabel("") - newRepo.currentVersion = grid.NewLabel("") - - newRepo.endBox = grid.NewHorizontalBox("HBOX") + newRepo.endBox = r.reposgrid.NewHorizontalBox("HBOX") newRepo.endBox.NewButton("Configure", func() { newRepo.Status.Toggle() }) @@ -141,6 +125,7 @@ func (r *RepoList) makeAutotypistView(newRepo *RepoRow) { r.reposbox.Enable() }) + /* if strings.HasPrefix(newRepo.GoPath(), "go.wit.com/apps") { var showBuildB bool = false switch newRepo.Status.RepoType() { @@ -158,8 +143,11 @@ func (r *RepoList) makeAutotypistView(newRepo *RepoRow) { }) } } + */ + r.reposgrid.NextRow() + newRepo.Status.InitOk = true + return newRepo, nil } -*/ func (r *RepoList) makeGuireleaserView(newRepo *RepoRow) { grid := r.reposgrid diff --git a/scan.go b/scan.go index f6a3b14..8c0afd5 100644 --- a/scan.go +++ b/scan.go @@ -67,9 +67,13 @@ func (r *RepoRow) NewScan() int { r.masterVersion.SetLabel(r.pb.GitMasterVersion()) r.develVersion.SetLabel(r.pb.GitDevelVersion()) r.userVersion.SetLabel(r.pb.GitUserVersion()) - // r.gitState.SetLabel(r.Status.GetState()) - // r.currentName.SetLabel(r.Status.CurrentBranchName()) - // r.currentVersion.SetLabel(r.Status.CurrentBranchVersion()) + r.gitState.SetLabel(r.Status.GitState()) + r.currentName.SetLabel(r.Status.GetCurrentBranchName()) + r.currentVersion.SetLabel(r.Status.GetCurrentBranchVersion()) + + if r.Status.GitState() == "PERFECT" { + r.Hide() + } /* tags := []string{"%(objectname)", "%(creatordate)", "%(*authordate)", "%(refname)", "%(subject)"}