Handle case where jobset has no defined errormsg for api/jobsets #702
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
basvandijk
requested changes
Jan 14, 2020
src/lib/Hydra/Controller/API.pm
Outdated
| @@ -88,7 +88,7 @@ sub jobsetToHash { | |||
| triggertime => $jobset->triggertime, | |||
| fetcherrormsg => $jobset->fetcherrormsg, | |||
| errortime => $jobset->errortime, | |||
| haserrormsg => $jobset->errormsg eq "" ? JSON::false : JSON::true | |||
| haserrormsg => defined($jobset->errormsg) ? ($jobset->errormsg eq "" ? JSON::false : JSON::true) : JSON::false | |||
There was a problem hiding this comment.
I think it's clearer to collapse the nested condition into a single condition like:
Suggested change
| haserrormsg => defined($jobset->errormsg) ? ($jobset->errormsg eq "" ? JSON::false : JSON::true) : JSON::false | |
| haserrormsg => defined($jobset->errormsg) && $jobset->errormsg ne "" ? JSON::true : JSON::false |
|
@kquick Could you squash these commits? |
|
I'd prefer not to squash these commits, since I've already merged them into other branches and the result would be pretty impactful from an administrative perspective (... it would take a significant amount of effort to rebuild those other branches, which had other commits on them as well). OK, @nlewo? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes logged messages: