Settings org 2 #5285
Merged
Settings org 2 #5285
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
Organization - name - groups (Many to Many relationship to auth.Group) Model Updates: Profile - organizations (Many to Many relationship to dashboard.Organization) sync_profile updates: - updated to account for change to organizations referenced above New Management Command: - app/management/sync_orgs_repo.py - no arguments presently - designed to be run as a long running cron job
- Reverted the change around profile.organizations due to its usage in user hover cards Profile Model - organizations restored - orgs key added for the sync work
… and not lose permissions
- stale orgs and groups are now purged from users
… in profile.organizations against profile.orgs
Profile Model Class - repos added - ManyToMany on Repo Organization Class - repos added - ManyToMany on Repo Repos now synced through the sync command
… into feature/bounty-payout-4969
- added a scope variable that if set lets the scope path be queried for the user scope
(cherry picked from commit 0faf13e)
- switch to querying profiles and querying users where they exist - additional exception handling to database calls made inside the `recursive_sync` function
- additional exception handling and error messages to help debugging any issues with user profiles - private organizations should now correctly be capturable when they are granted access during login
- adding a per_page limit of 100 to the calls as a stop gap to proper pagination handling
Codecov Report
@@ Coverage Diff @@
## master #5285 +/- ##
=========================================
- Coverage 29.8% 29.61% -0.2%
=========================================
Files 236 237 +1
Lines 19891 20082 +191
Branches 2840 2873 +33
=========================================
+ Hits 5929 5947 +18
- Misses 13721 13890 +169
- Partials 241 245 +4
Continue to review full report at Codecov.
|
octavioamu
commented
Oct 2, 2019
app/dashboard/views.py
Outdated
Comment on lines
99
to
127
| def org_perms(request): | ||
| if request.user.is_authenticated and getattr(request.user, 'profile', None): | ||
| profile = request.user.profile | ||
| else: | ||
| return JsonResponse( | ||
| {'error': _('You must be authenticated via github to use this feature!')}, | ||
| status=401) | ||
| orgs = profile.profile_organizations.all() | ||
|
|
||
| response_data = [] | ||
| for org in orgs: | ||
| print(org) | ||
| org_perms = {'name': org.name, 'users': []} | ||
| groups = org.groups.all().filter(user__isnull=False) | ||
| for g in groups: # "admin", "write", "pull", "none" | ||
| print(g) | ||
| group_data = g.name.split('-') | ||
| if group_data[1] != "role": #skip repo level groups | ||
| continue | ||
| print(g.user_set.prefetch_related('profile').all()) | ||
| org_perms['users'].append( | ||
| *[{'handle': u.profile.handle, | ||
| 'role': group_data[2], | ||
| 'name': '{} {}'.format(u.first_name, u.last_name)} | ||
| for u in g.user_set.prefetch_related('profile').all()]) | ||
| response_data.append(org_perms) | ||
| return JsonResponse({'orgs': response_data}, safe=False) | ||
|
|
||
|
|
There was a problem hiding this comment.
@danlipert I had changed a little the code from #5197
- added a missing comma as per the PR, - created a merge migration from the most recent master. Merge branch 'master' of github.com:gitcoinco/web into feature/bounty-payout-4969
danlipert
approved these changes
Oct 23, 2019
thelostone-mc
approved these changes
Oct 23, 2019
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
NOTE This depends on #5027 to be merged first
Refers/Fixes
fix #5160
fix #5130
Testing