diff --git a/cycle.go b/cycle.go index 4a913c5..129d579 100644 --- a/cycle.go +++ b/cycle.go @@ -223,12 +223,12 @@ func (p *Project) release() { p.setStage(stageReleased) if p.errHandled(p.ds.AddLog(p.version, p.stage, - fmt.Sprintf("Project: %s Version %s built, tested, and released successfully.\n", p.id(), p.version))) { + fmt.Sprintf("Project %s Version %s built, tested, and released successfully.\n", p.id(), p.version))) { return } //build successfull, remove working dir p.errHandled(os.RemoveAll(p.workingDir())) - vlog("Project: %s Version %s built, tested, and released successfully.\n", p.id(), p.version) + vlog("Project %s Version %s built, tested, and released successfully.\n", p.id(), p.version) } diff --git a/datastore/log.go b/datastore/log.go index 3b2aee6..e5b8df3 100644 --- a/datastore/log.go +++ b/datastore/log.go @@ -86,7 +86,6 @@ func (ds *Store) Versions() ([]*Log, error) { // capture the newest entry for each version if l.Version != current { - l.Log = "" // only care about date, ver and stage vers = append(vers, l) current = l.Version } diff --git a/web/index.html b/web/index.html index a433261..045e706 100644 --- a/web/index.html +++ b/web/index.html @@ -134,6 +134,7 @@ Status Stage Last Release + Last Release File Last Version Last Log @@ -144,8 +145,15 @@ {{.name}} {{.status}} {{.stage}} - {{.releaseVersion}} - {{.lastLog.version}} + + {{.releaseVersion}} + + + Download + + + {{.lastLog.version}} + {{#if .lastLog.log}}{{.lastLog.log.substring(0,100) + " ..."}}{{/if}} {{/projects}} @@ -168,7 +176,9 @@ {{#project.versions:i}} - {{.version}} + + {{.version}} + {{.stage}} {{#if .log}}{{.log.substring(0,100) + " ..."}}{{/if}} diff --git a/web/js/index.js b/web/js/index.js index 74ef888..b0b3ada 100644 --- a/web/js/index.js +++ b/web/js/index.js @@ -15,6 +15,7 @@ Ractive.DEBUG = false; return { project: null, version: null, + stages: null, stage: null, projects: [], error: null, @@ -43,7 +44,7 @@ Ractive.DEBUG = false; if (paths[3]) { getVersion(paths[2], paths[3]); if (paths[4]) { - getStage(paths[2], paths[3], paths[4]); + getStage(paths[2], paths[3], paths[4]); } } } @@ -80,9 +81,10 @@ Ractive.DEBUG = false; } function getVersion(id, version) { + r.set("version", version); get("/log/" + id + "/" + version, function(result) { - r.set("version", result.data); + r.set("stages", result.data); }, function(result) { r.set("error", err(result).message);