Merge pull request #464 from github/fixes/453-descriptive-errors

shana · web-flow · commit c14da9b5e2cf · 2016-08-01T13:07:44.000+02:00
Descriptive Pull Request Creation Errors
diff --git a/src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs b/src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs
@@ -13,6 +13,7 @@
 using GitHub.Extensions;
 using NullGuard;
 using GitHub.App;
+using Octokit;
 
 namespace GitHub.ViewModels
 {
@@ -75,7 +76,10 @@ public PullRequestCreationViewModel(IRepositoryHost repositoryHost, ISimpleRepos
             {
                 if (!ex.IsCriticalException())
                 {
-                    notifications.ShowError(ex.Message);
+                    //TODO:Will need a uniform solution to HTTP exception message handling
+                    var apiException = ex as ApiValidationException;
+                    var error = apiException?.ApiError?.Errors?.FirstOrDefault();
+                    notifications.ShowError(error?.Message ?? ex.Message);
                 }
             });
         }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`using GitHub.Extensions;`
`14`	`14`	`using NullGuard;`
`15`	`15`	`using GitHub.App;`
	`16`	`+using Octokit;`
`16`	`17`
`17`	`18`	`namespace GitHub.ViewModels`
`18`	`19`	`{`
`@@ -75,7 +76,10 @@ public PullRequestCreationViewModel(IRepositoryHost repositoryHost, ISimpleRepos`
`75`	`76`	`{`
`76`	`77`	`if (!ex.IsCriticalException())`
`77`	`78`	`{`
`78`		`- notifications.ShowError(ex.Message);`
	`79`	`+ //TODO:Will need a uniform solution to HTTP exception message handling`
	`80`	`+ var apiException = ex as ApiValidationException;`
	`81`	`+ var error = apiException?.ApiError?.Errors?.FirstOrDefault();`
	`82`	`+ notifications.ShowError(error?.Message ?? ex.Message);`
`79`	`83`	`}`
`80`	`84`	`});`
`81`	`85`	`}`