townsourced/ironsmith
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added pre-version version

Browse Source 
No fetch and load errors can be properly seen without having to run
ironsmith manually.
This commit is contained in:
Tim Shannon 2016-04-25 19:41:03 +00:00
parent 7a0b821be4
commit 04060ee63d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindata.go
View File

File diff suppressed because one or more lines are too long

2
cycle.go
View File

@ -32,7 +32,7 @@ func (p *Project) load() {
defer p.processing.Unlock() defer p.processing.Unlock()
p.setStage(stageLoad) p.setStage(stageLoad)
p.setVersion("") p.setVersion("Version not yet set")
if p.filename == "" { if p.filename == "" {
p.errHandled(errors.New("Invalid project file name")) p.errHandled(errors.New("Invalid project file name"))

10
web/js/index.js
View File

@ -135,7 +135,11 @@ Ractive.DEBUG = false;
function getVersion(id, version) { function getVersion(id, version) {
get("/log/" + id + "/" + version, get("/log/" + id + "/" + version,
function(result) { function(result) {
r.set("version", version); if (!result.data || !result.data.length || !result.data[0].version) {
r.set("version", version);
} else {
r.set("version", result.data[0].version);
}
r.set("stages", result.data); r.set("stages", result.data);
}, },
function(result) { function(result) {
@ -171,8 +175,8 @@ Ractive.DEBUG = false;
//statuses //statuses
if (project.stage != "waiting") { if (project.stage != "waiting") {
project.status = project.stage; project.status = project.stage;
} else if(!project.lastLog || !project.lastLog.version) { } else if (!project.lastLog || !project.lastLog.version) {
project.status = "waiting"; project.status = "waiting";
} else if (project.lastLog.version.trim() == project.releaseVersion.trim()) { } else if (project.lastLog.version.trim() == project.releaseVersion.trim()) {
project.status = "Successfully Released"; project.status = "Successfully Released";
} else { } else {