Browse Source

Fix table if pagination is not used

Vova Tkach 6 years ago
parent
commit
a9173306a8
1 changed files with 7 additions and 0 deletions
  1. 7 0
      engine/builder/data_table.go

+ 7 - 0
engine/builder/data_table.go

@@ -101,6 +101,7 @@ func DataTable(
 	result += `</thead>`
 	result += `</thead>`
 	result += `<tbody>`
 	result += `<tbody>`
 	if num > 0 || !pagination_enabled {
 	if num > 0 || !pagination_enabled {
+		have_records := false
 		var rows *sql.Rows
 		var rows *sql.Rows
 		var err error
 		var err error
 		if custom_sql_data == nil {
 		if custom_sql_data == nil {
@@ -117,6 +118,9 @@ func DataTable(
 			for rows.Next() {
 			for rows.Next() {
 				err = rows.Scan(scan...)
 				err = rows.Scan(scan...)
 				if err == nil {
 				if err == nil {
+					if !have_records {
+						have_records = true
+					}
 					result += `<tr>`
 					result += `<tr>`
 					for i, val := range values {
 					for i, val := range values {
 						if (*data)[i].NameInTable != "" {
 						if (*data)[i].NameInTable != "" {
@@ -138,6 +142,9 @@ func DataTable(
 				}
 				}
 			}
 			}
 		}
 		}
+		if !have_records {
+			result += `<tr><td colspan="50">No any data found</td></tr>`
+		}
 	} else {
 	} else {
 		result += `<tr><td colspan="50">No any data found</td></tr>`
 		result += `<tr><td colspan="50">No any data found</td></tr>`
 	}
 	}