Make show speaker return to main menu work

Author: mattstratton

cmd/prompt.go

@@ -115,7 +115,10 @@ func showSpeakerPrompt(city, year string) (err error) {
 				break
 			}
 		}
-		speaker.ShowSpeakers(city, year)
+		exitCode, err = speaker.ShowSpeakers(city, year)
+		if exitCode == true {
+			return
+		}
 
 	}
 	return

event/event.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
-	
+
 	"text/template"
 
 	helpers "github.com/devopsdays/devopsdays-cli/helpers"
@@ -32,7 +32,7 @@ var qsCreateEvent = []*survey.Question{
 			Help:    "Twitter username can include the @ symbol or not. Examples: '@devopsdays' or 'devopsdays",
 		},
 		Validate: func(val interface{}) error {
-			if str, _ := val.(string); (str != "") && (helpers.ValidateField(str, "twitter") == false) {
+			if str, _ := val.(string); (str != "") && !helpers.ValidateField(str, "twitter") {
 				return errors.New("Please enter a valid Twitter handle. Spaces are not allowed.")
 			}
 			return nil

speaker/show_speakers.go

@@ -9,7 +9,7 @@ import (
 	survey "gopkg.in/AlecAivazis/survey.v1"
 )
 
-func ShowSpeakers(city, year string) (err error) {
+func ShowSpeakers(city, year string) (exitCode bool, err error) {
 	var selection string
 
 	speakerList, _ := GetSpeakers(city, year)
@@ -23,7 +23,7 @@ func ShowSpeakers(city, year string) (err error) {
 		}
 		survey.AskOne(prompt, &selection, nil)
 		if selection == "Return to Main Menu" {
-			return
+			return true, nil
 		}
 		speakerFileName := strings.Join([]string{strings.TrimSpace(names.NameClean(selection)), ".md"}, "")
 
@@ -57,5 +57,5 @@ func ShowSpeakers(city, year string) (err error) {
 		color.Cyan("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+")
 		fmt.Println()
 	}
-	return
+	return true, nil
 }