From 57dfe65c10dd9251ae17d775227d3111ad157c6b Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 27 Nov 2015 21:41:31 +0400 Subject: [PATCH 1/3] :bug: Remove 'null' text from front-facing messages --- lib/github-file.coffee | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/github-file.coffee b/lib/github-file.coffee index 1db7445..07f5f07 100644 --- a/lib/github-file.coffee +++ b/lib/github-file.coffee @@ -86,13 +86,22 @@ class GitHubFile # Public validationErrors: -> unless @repo - return ["No repository found for path: #{@filePath}."] + if @filePath + return ["No repository found for path: #{@filePath}"] + else + return ["No repository found for path"] unless @gitUrl() - return ["No URL defined for remote: #{@remoteName()}"] + if @remoteName() + return ["No URL defined for remote filepath: #{@remoteName()}"] + else + return ["No URL defined for remote filepath"] unless @githubRepoUrl() - return ["Remote URL is not hosted on GitHub: #{@gitUrl()}"] + if @gitUrl() + return ["Remote URL is not hosted on GitHub: #{@gitUrl()}"] + else + return ["Remote URL is not hosted on GitHub"] [] From 3daf249a831c442156d7ea4a70410c1177f6eaf9 Mon Sep 17 00:00:00 2001 From: g23-aw Date: Fri, 27 Nov 2015 11:17:41 -0800 Subject: [PATCH 2/3] fix extra space between for and path --- lib/github-file.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-file.coffee b/lib/github-file.coffee index 07f5f07..234a449 100644 --- a/lib/github-file.coffee +++ b/lib/github-file.coffee @@ -87,7 +87,7 @@ class GitHubFile validationErrors: -> unless @repo if @filePath - return ["No repository found for path: #{@filePath}"] + return ["No repository found for path: #{@filePath}"] else return ["No repository found for path"] From 7998520160f81cefdd42deeb63d96876269b9de7 Mon Sep 17 00:00:00 2001 From: Arabelle Date: Sat, 5 Dec 2015 16:21:10 -0800 Subject: [PATCH 3/3] Add marking text for CPEN 321 TAs --- marking.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 marking.txt diff --git a/marking.txt b/marking.txt new file mode 100644 index 0000000..2c4da91 --- /dev/null +++ b/marking.txt @@ -0,0 +1,5 @@ +We changed the way that the validation errors returned so that if the filePath +was null, it would not show "null" on the user interface. We also changed some of +the wording of errors. +Implementation: 'validationErrors: ->' function +File: lib/github-file.coffee