From ac71822352003469d1efe235e4ebf2d8807003c6 Mon Sep 17 00:00:00 2001 From: yackob03 Date: Mon, 4 Nov 2013 16:57:20 -0500 Subject: [PATCH] Add a description field to teams. --- data/database.py | 1 + data/model.py | 7 ++++--- initdb.py | 3 ++- test/data/test.db | Bin 96256 -> 96256 bytes 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/data/database.py b/data/database.py index a211f4a15..8483a20e3 100644 --- a/data/database.py +++ b/data/database.py @@ -45,6 +45,7 @@ class Team(BaseModel): name = CharField(index=True) organization = ForeignKeyField(User, index=True) role = ForeignKeyField(TeamRole) + description = TextField(default='') class Meta: database = db diff --git a/data/model.py b/data/model.py index 176fe3851..c2ab8bf07 100644 --- a/data/model.py +++ b/data/model.py @@ -89,7 +89,7 @@ def create_organization(name, email, creating_user): new_org.save() # Create a team for the owners - owners_team = create_team('Owners', new_org, 'admin') + owners_team = create_team('owners', new_org, 'admin') # Add the user who created the org to the owners team add_user_to_team(creating_user, owners_team) @@ -99,7 +99,7 @@ def create_organization(name, email, creating_user): raise InvalidOrganizationException('Invalid organization name: %s' % name) -def create_team(name, org, team_role_name): +def create_team(name, org, team_role_name, description=''): if not validate_username(name): raise InvalidTeamException('Invalid team name: %s' % name) @@ -108,7 +108,8 @@ def create_team(name, org, team_role_name): org.username) team_role = TeamRole.get(TeamRole.name == team_role_name) - return Team.create(name=name, organization=org, role=team_role) + return Team.create(name=name, organization=org, role=team_role, + description=description) def add_user_to_team(user, team): diff --git a/initdb.py b/initdb.py index 898d09e88..6acb613f2 100644 --- a/initdb.py +++ b/initdb.py @@ -156,7 +156,8 @@ if __name__ == '__main__': 'Repository owned by an org.', False, [], (4, [], ['latest', 'prod'])) - reader_team = model.create_team('Readers', org, 'member') + reader_team = model.create_team('readers', org, 'member', + 'Readers of orgrepo.') model.set_team_repo_permission(reader_team.name, org_repo.namespace, org_repo.name, 'read') model.add_user_to_team(new_user_2, reader_team) diff --git a/test/data/test.db b/test/data/test.db index 2d7a73749929dcb742e48faf849d26e3e92e2f38..a7088591b06e12fe09675f27ee2f6952d4b9ed3c 100644 GIT binary patch delta 451 zcmZqpz}oPEbwhx)sb5G*lx23Zqot*{iHnnYVVHYxdPQkrR7tjlzmLA2rIBGtVoHFw zUP@M8Vp48km5W}9f8pfw-V&4NT1%NGRRrlJMfs&hL*g>gySrI_0PM8oT8eZhm7eCBi4hz#ztu#@NRs$TW?4#%9BSW+u*h z5q5D=QO4%P$$NutO`f_`gj2!KKSaSV)W>J@^x%9BwzCY(ADPc?7GycdtgFPt#vske zXk3(+v$OF-S6U^5$>;75{~s7pjzrlUb58fAjC` z5A6If-AvppK!rec#jBj7Lo7`E&4c`mygghE3_ZPFJS_c;jNL3EBYZpqE&RiSg4~1M zU0mIQLjrwF{QV=tE!yG_x`_vobN#Gd4Cg TF*exzfBQjZ2TCniv}X?hX{L#B delta 420 zcmZqpz}oPEbwhx)sj+FcvwNy*lv%m2yN5}reom=Jk)^+HMM;6FOIV72QkK43YDKt@ zTUlY4xqhK#X{lGCtKQ`E-V&4NT1%M*mZt_r>IGFr>G>DyhZ%