Closed tkellen closed 9 years ago
Stay with me for a minute; it's worth it:
$ git fetch upstream
remote: Counting objects: 16, done.
remote: Compressing objects: 100% (16/16), done.
remote: Total 16 (delta 0), reused 1 (delta 0)
Unpacking objects: 100% (16/16), done.
From github.com:bocoup/black-phoenix
* [new branch] disable-on-project-required -> upstream/disable-on-project-required
801eca5..c375e06 master -> upstream/master
$ git log --oneline -n 4 honor-project-required-field
4d2154a Honor UtilizationType's `project_required` field
35c684a Correctly parse JSONAPI response for phase reviews
198c786 Correctly handle single-model JSON API responses
1f3c117 Update PUT and POST for `project-phase-review`
$ git log --oneline -n 4 upstream/disable-on-project-required
0b36315 alter disabled selection criteria
c375e06 Merge pull request #56 from bocoup/json-api-compliance
1f3c117 Update PUT and POST for `project-phase-review`
0657913 Wrap PUT and POST requests in record's type name
$ git checkout -B tyler-rebased upstream/disable-on-project-required
$ git rebase honor-project-required-field~
First, rewinding head to replay your work on top of it...
Applying: alter disabled selection criteria
$ git diff HEAD honor-project-required-field tyler-rebased
diff --git a/src/client/modules/components/review-employee-row-day/index.js b/src/client/modules/components/review-employee-row-day/index.js
index 3b47f3f..81b554d 100644
--- a/src/client/modules/components/review-employee-row-day/index.js
+++ b/src/client/modules/components/review-employee-row-day/index.js
@@ -136,7 +136,7 @@ module.exports = Component.extend({
var type = this.get('newType');
- if (!type || !type.get('project_required')) {
+ if (!type || !type.project_required) {
return null;
}
$ echo "Great minds."
In other news, I really need to pay attention to GitHub's "Assignee" label.
lol!
Previously, the UI disabled selects for position, project and phase if the selected utilization type was id #1 (consulting).
Utilization types have a field,
project_required
, which is a more accurate heuristic for this. This commit implements support for that field.I've also removed the tests for the utilization_type model as it no longer has derived properties to be tested. I didn't see any tests for the UI behavior, and have not attempted to add any.
closes gh-59