zecfoundation
/
zcash-grant-system
mirror of https://github.com/ZcashFoundation/zcash-grant-system.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

arbiter & related schema adjustments

This commit is contained in:
Aaron 2019-02-06 08:31:38 -06:00
parent eb8c1ec258
commit 54e9889090
No known key found for this signature in database
GPG Key ID: 3B5B7597106F0A0E
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/grant/admin/views.py
View File

@ -11,7 +11,7 @@ from grant.proposal.models import (
proposal_schema,
user_proposal_contributions_schema,
)
from grant.user.models import User, users_schema, user_schema
from grant.user.models import User, admin_users_schema, admin_user_schema
from grant.rfp.models import RFP, admin_rfp_schema, admin_rfps_schema
from grant.utils.admin import admin_auth_required, admin_is_authed, admin_login, admin_logout
from grant.utils.enums import ProposalStatus
@ -90,7 +90,7 @@ def delete_user(user_id):
@admin_auth_required
def get_users():
users = User.query.all()
result = users_schema.dump(users)
result = admin_users_schema.dump(users)
return result
@ -100,7 +100,7 @@ def get_users():
def get_user(id):
user_db = User.query.filter(User.id == id).first()
if user_db:
user = user_schema.dump(user_db)
user = admin_user_schema.dump(user_db)
user_proposals = Proposal.query.filter(Proposal.team.any(id=user['userid'])).all()
user['proposals'] = proposals_schema.dump(user_proposals)
user_comments = Comment.get_by_user(user_db)

6
backend/grant/user/models.py
View File

@ -244,7 +244,7 @@ class SelfUserSchema(ma.Schema):
avatar = ma.Nested("AvatarSchema")
userid = ma.Method("get_userid")
email_verified = ma.Method("get_email_verified")
arbitrated_proposals = ma.Nested("Proposals", many=True, exclude=["arbitor"])
arbitrated_proposals = ma.Nested("ProposalSchema", many=True, exclude=["arbiter"])
def get_userid(self, obj):
return obj.id
@ -256,6 +256,10 @@ class SelfUserSchema(ma.Schema):
self_user_schema = SelfUserSchema()
self_users_schema = SelfUserSchema(many=True)
# differentiate from self, same for now
admin_user_schema = self_user_schema
admin_users_schema = self_users_schema
class UserSchema(ma.Schema):
class Meta: