forked from toolshed/abra
		
	review: merge chaos + chaos_version column
This commit is contained in:
		@ -241,7 +241,7 @@ can take some time.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
			tableCol := []string{"recipe", "domain"}
 | 
								tableCol := []string{"recipe", "domain"}
 | 
				
			||||||
			if status {
 | 
								if status {
 | 
				
			||||||
				tableCol = append(tableCol, []string{"status", "chaos", "chaos version", "version", "upgrade", "autoupdate"}...)
 | 
									tableCol = append(tableCol, []string{"status", "chaos", "version", "upgrade", "autoupdate"}...)
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			table := formatter.CreateTable(tableCol)
 | 
								table := formatter.CreateTable(tableCol)
 | 
				
			||||||
@ -249,7 +249,13 @@ can take some time.
 | 
				
			|||||||
			for _, appStat := range serverStat.Apps {
 | 
								for _, appStat := range serverStat.Apps {
 | 
				
			||||||
				tableRow := []string{appStat.Recipe, appStat.Domain}
 | 
									tableRow := []string{appStat.Recipe, appStat.Domain}
 | 
				
			||||||
				if status {
 | 
									if status {
 | 
				
			||||||
					tableRow = append(tableRow, []string{appStat.Status, appStat.Chaos, appStat.ChaosVersion, appStat.Version, appStat.Upgrade, appStat.AutoUpdate}...)
 | 
										chaosStatus := "unknown"
 | 
				
			||||||
 | 
										if appStat.ChaosVersion != "unknown" {
 | 
				
			||||||
 | 
											chaosStatus = appStat.Chaos + appStat.ChaosVersion
 | 
				
			||||||
 | 
										} else {
 | 
				
			||||||
 | 
											chaosStatus = appStat.Chaos
 | 
				
			||||||
 | 
										}
 | 
				
			||||||
 | 
										tableRow = append(tableRow, []string{appStat.Status, chaosStatus, appStat.Version, appStat.Upgrade, appStat.AutoUpdate}...)
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				table.Append(tableRow)
 | 
									table.Append(tableRow)
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user