Skip to content
This repository was archived by the owner on May 3, 2024. It is now read-only.

Commit c4da8df

Browse files
committed
bux fixes - allow save/load on node view - version bump
1 parent 29dd478 commit c4da8df

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

envdb.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
const (
1616
Name = "envdb"
17-
Version = "0.2.1"
17+
Version = "0.2.2"
1818

1919
DefaultServerPort = 3636
2020
DefaultWebServerPort = 8080
@@ -30,8 +30,7 @@ var (
3030

3131
server = app.Command("server", "Start the tcp server for node connections.")
3232
// serverConfig = server.Flag("config", "Server configuration file.").File()
33-
serverPort = server.Flag("port", "Port for the server to listen on.").PlaceHolder(fmt.Sprintf("%d", DefaultServerPort)).Int()
34-
33+
serverPort = server.Flag("port", "Port for the server to listen on.").PlaceHolder(fmt.Sprintf("%d", DefaultServerPort)).Int()
3534
serverWebPort = server.Flag("http-port", "Port for the web server to listen on.").PlaceHolder(fmt.Sprintf("%d", DefaultWebServerPort)).Int()
3635

3736
node = app.Command("node", "Register a new node.")

http.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ func NewWebServer(webPort int, server *Server) {
6969
if len(data) != 1 {
7070
d := QueryResults{}
7171

72-
return d, errors.New(fmt.Sprintf("Node not found for id (%s).", sql.Id))
72+
err := errors.New(fmt.Sprintf("Node not found for id (%s).", sql.Id))
73+
return d, err
7374
}
7475

7576
tables = strings.Split(data[0].Results.(string), "\n")
@@ -94,7 +95,8 @@ func NewWebServer(webPort int, server *Server) {
9495
if len(data) != 1 {
9596
d := QueryResults{}
9697

97-
return d, errors.New(fmt.Sprintf("Node not found for id (%s).", sql.Id))
98+
err := errors.New(fmt.Sprintf("Node not found for id (%s).", sql.Id))
99+
return d, err
98100
}
99101

100102
return data[0], nil

web/public/js/envdb.js

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ var Envdb = {
180180

181181
$("#content").removeClass("node-view");
182182
$("#node-tables").remove();
183-
$(".save-query, .load-query").addClass("disabled");
183+
// $(".save-query, .load-query").addClass("disabled");
184184
$('.table-filter').addClass("node-view");
185185
$(".table-filter").show().find("input").val("");
186186
$("#content").css("left", 460);
@@ -190,7 +190,7 @@ var Envdb = {
190190
this.clean();
191191
$("#header .title").text("Query All Nodes");
192192
$("a.run-query").text("Run Query");
193-
$(".save-query, .load-query").removeClass("disabled");
193+
// $(".save-query, .load-query").removeClass("disabled");
194194
$('.table-filter').removeClass("node-view");
195195
$(".table-filter").hide().find("input").val("");
196196
$("#content").css("left", 230);
@@ -507,6 +507,7 @@ var Envdb = {
507507
}
508508

509509
var table = null;
510+
var count = 0
510511

511512
if (results && results.length > 0) {
512513

@@ -540,6 +541,25 @@ var Envdb = {
540541
var row = Envdb.Templates.row(data)
541542
$("table.query-results tbody").append(row);
542543

544+
count++;
545+
}
546+
547+
if (count <= 0) {
548+
if (Envdb.fixedTable) {
549+
Envdb.fixedTable._fnDestroy();
550+
Envdb.fixedTable = false;
551+
}
552+
553+
if (Envdb.table) {
554+
Envdb.table.destroy();
555+
Envdb.table = false;
556+
}
557+
558+
Envdb.Loading.done()
559+
Envdb.Flash.error("No results found.");
560+
561+
$("#content .wrapper").html("");
562+
return
543563
}
544564

545565
Envdb.table = $("table.query-results")

0 commit comments

Comments
 (0)