store target version in the repolist

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 18 insertions, 18 deletions

diff --git a/releaseWindow.go b/releaseWindow.go
index d59bd76..fa5608a 100644
--- a/releaseWindow.go
+++ b/releaseWindow.go
@@ -25,8 +25,8 @@ type releaseStruct struct {
 	readOnly        *gadgets.OneLiner
 	notes           *gadgets.OneLiner
 	version         *gadgets.OneLiner
-	versionS        string
-	widgetVersionS  string
+//	versionS        string
+//	widgetVersionS  string
 	releaseVersionB *gui.Node
 	unreleaseB      *gui.Node
 	reason          *gadgets.BasicEntry
@@ -60,9 +60,7 @@ func (w *autoType) Enable() {
 }
 
 func createReleaseBox(box *gui.Node) {
-	release.versionS = "0.19.0"
-	release.widgetVersionS = "1.1.13"
-	release.reasonS = "gocui checkboxes"
+	release.reasonS = "gocui dropdown"
 
 	initWhitelist()
 
@@ -81,12 +79,15 @@ func createReleaseBox(box *gui.Node) {
 	})
 	release.grid.NewButton("findNextDirty()", func() {
 		me.Disable()
-		if findNextDirty() {
+		defer me.Enable()
+		if findNextDirty("PRIMATIVE") {
+			log.Info("findNextDirty() found a repo")
+			return
+		}
+		if findNextDirty("") {
 			log.Info("findNextDirty() found a repo")
-			me.Enable()
 			return
 		}
-		me.Enable()
 	})
 	release.releaseVersionB = release.grid.NewButton("release version", func() {
 		buttonDisable()
@@ -389,15 +390,9 @@ func setCurrentRepo(newcur *repo, s string, note string) bool {
 	release.status.SetValue(s)
 	release.notes.SetValue(note)
 	release.current = newcur
-	if newcur.String() == "go.wit.com/widget" {
-		release.version.SetText("v" + release.widgetVersionS)
-		release.releaseVersionB.SetText("release version v" + release.widgetVersionS)
-		release.unreleaseB.SetText("un-release version v" + release.widgetVersionS)
-	} else {
-		release.version.SetText("v" + release.versionS)
-		release.releaseVersionB.SetText("release version v" + release.versionS)
-		release.unreleaseB.SetText("un-release version v" + release.versionS)
-	}
+	release.version.SetText(release.current.targetVersion.String())
+	release.releaseVersionB.SetText("release version" + release.current.targetVersion.String())
+	release.unreleaseB.SetText("un-release version" + release.current.targetVersion.String())
 	release.openrepo.Enable()
 
 	/*
@@ -415,6 +410,7 @@ func scanForReady() bool {
 		goSumS := repo.getGoSumStatus()
 		dirtyS := repo.dirtyLabel.String()
 		log.Info("findNextDirty()", repo.String(), goSumS, dirtyS)
+
 		if whitelist(repo.String()) {
 			log.Info("found WHITELIST", repo.String())
 			repo.setGoSumStatus("WHITELIST")
@@ -429,7 +425,7 @@ func scanForReady() bool {
 	return true
 }
 
-func findNextDirty() bool {
+func findNextDirty(onlyKind string) bool {
 	for _, repo := range me.allrepos {
 		goSumS := repo.getGoSumStatus()
 		dirtyS := repo.dirtyLabel.String()
@@ -444,6 +440,10 @@ func findNextDirty() bool {
 				}
 			}
 			continue
+		} else {
+			if onlyKind == "PRIMATIVE" {
+				continue
+			}
 		}
 		if goSumS == "IGNORE" {
 			continue