Browse Source

Fix in progress second mailer icon, update modify query

Vova Tkach 5 years ago
parent
commit
20d906bb37
2 changed files with 3 additions and 1 deletions
  1. 2 0
      engine/builder/builder.go
  2. 1 1
      modules/module_notify_mail.go

+ 2 - 0
engine/builder/builder.go

@@ -11,6 +11,8 @@ func CheckBox(value int) string {
 		return `<span class="svg-green">` + assets.SysSvgIconChecked + `</span>`
 	} else if value == 2 {
 		return `<span class="svg-yellow">` + assets.SysSvgIconRestore + `</span>`
+	} else if value == 3 {
+		return `<span class="svg-yellow">` + assets.SysSvgIconEmail + `</span>`
 	}
 	return ""
 }

+ 1 - 1
modules/module_notify_mail.go

@@ -40,7 +40,7 @@ func (this *Modules) RegisterModule_NotifyMail() *Module {
 			} else if wrap.CurrSubModule == "in-progress" {
 				ModuleName = "In progress"
 				ModulePagination = "/cp/" + wrap.CurrModule + "/in-progress/"
-				ModuleSqlWhere = " WHERE notify_mail.status = 2"
+				ModuleSqlWhere = " WHERE notify_mail.status = 2 OR notify_mail.status = 3"
 			} else if wrap.CurrSubModule == "error" {
 				ModuleName = "Error"
 				ModulePagination = "/cp/" + wrap.CurrModule + "/error/"