Convert business units to DB table #992
Merged
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
tbaxter-18f
changed the title
Jkrzy
reviewed
Mar 10, 2020
tbaxter-18f
commented
Mar 10, 2020
| @@ -94,21 +94,13 @@ class GeneralSnippetsTimecardSerializer(serializers.Serializer): | |||
| ) | |||
| hours_spent = serializers.DecimalField(max_digits=5, decimal_places=2) | |||
| notes = serializers.CharField() | |||
| unit = serializers.SerializerMethodField() | |||
There was a problem hiding this comment.
We had already defined unit on L88
amymok
suggested changes
Mar 11, 2020
tock/employees/admin.py
Outdated
| @@ -65,7 +65,7 @@ class UserDataAdmin(admin.ModelAdmin): | |||
| search_fields = ('user__username',) | |||
|
|
|||
| def unit_info(self, obj): | |||
| return obj.get_unit_display() | |||
| return obj.unit.name | |||
There was a problem hiding this comment.
This needs to check for None object. It is currently breaking the admin interface.
There was a problem hiding this comment.
Nice catch Amy! Updated, and added a comment.
Codecov Report
@@ Coverage Diff @@
## master #992 +/- ##
==========================================
+ Coverage 91.52% 91.60% +0.07%
==========================================
Files 39 39
Lines 1699 1691 -8
==========================================
- Hits 1555 1549 -6
+ Misses 144 142 -2
Continue to review full report at Codecov.
|
|
Merging this PR, something is not quite working in Snyk. There's no manifest changes. |
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.
Description
Resolves #965 and converts business units to a DB table instead of choices, along with updated tests and fixtures. Also cleans up some tech debt around how orgs are defined and used.