update output

Signed-off-by: Sylwester Piskozub <sylwesterpiskozub@gmail.com>

Author: Piskoo

app/cli/cmd/organization_describe.go

@@ -47,11 +47,7 @@ func contextTableOutput(config *action.ConfigContextItem) error {
 	gt := output.NewTableWriter()
 	gt.SetTitle("Current Context")
 
-	userInfo := config.CurrentUser.PrintUserProfileWithEmail()
-	if config.CurrentUser.InstanceAdmin {
-		userInfo += "\nInstance admin=true"
-	}
-	gt.AppendRow(table.Row{"Logged in as", userInfo})
+	gt.AppendRow(table.Row{"Logged in as", config.CurrentUser.PrintUserProfileWithEmail()})
 	gt.AppendSeparator()
 
 	if m := config.CurrentMembership; m != nil {

app/cli/pkg/action/config_current_context.go

@@ -59,11 +59,19 @@ func (u *UserItem) PrintUserProfileWithEmail() string {
 		name = u.LastName
 	}
 
+	var result string
 	// If we have a name, format with email, otherwise just return email
 	if name != "" {
-		return name + " <" + u.Email + ">"
+		result = name + " <" + u.Email + ">"
+	} else {
+		result = u.Email
 	}
-	return u.Email
+
+	if u.InstanceAdmin {
+		result += " (Instance admin)"
+	}
+
+	return result
 }
 
 func (action *ConfigCurrentContext) Run() (*ConfigContextItem, error) {