diff --git a/gratipay/models/team.py b/gratipay/models/team.py index 9632e7acca..6a26bc4e39 100644 --- a/gratipay/models/team.py +++ b/gratipay/models/team.py @@ -54,11 +54,10 @@ def insert(cls, owner, **fields): INSERT INTO teams (slug, slug_lower, name, homepage, - product_or_service, revenue_model, getting_involved, getting_paid, + product_or_service, owner) VALUES (%(slug)s, %(slug_lower)s, %(name)s, %(homepage)s, - %(product_or_service)s, %(revenue_model)s, %(getting_involved)s, - %(getting_paid)s, + %(product_or_service)s, %(owner)s) RETURNING teams.*::teams diff --git a/gratipay/testing/__init__.py b/gratipay/testing/__init__.py index 085d1a4d5f..1ef34ebf17 100644 --- a/gratipay/testing/__init__.py +++ b/gratipay/testing/__init__.py @@ -171,9 +171,8 @@ def make_team(self, *a, **kw): team = self.db.one(""" INSERT INTO teams (slug, slug_lower, name, homepage, product_or_service, - getting_involved, getting_paid, owner, is_approved) - VALUES (%(slug)s, %(slug_lower)s, %(name)s, %(homepage)s, - %(product_or_service)s, %(getting_involved)s, %(getting_paid)s, + owner, is_approved) + VALUES (%(slug)s, %(slug_lower)s, %(name)s, %(homepage)s, %(product_or_service)s, %(owner)s, %(is_approved)s) RETURNING teams.*::teams """, _kw) diff --git a/gratipay/utils/fake_data.py b/gratipay/utils/fake_data.py index 9321318ba7..2c4417957b 100644 --- a/gratipay/utils/fake_data.py +++ b/gratipay/utils/fake_data.py @@ -93,8 +93,6 @@ def fake_team(db, teamowner): , name=teamname , homepage='www.example.org/' + fake_text_id(3) , product_or_service=random.sample(productorservice,1)[0] - , getting_involved='build' - , getting_paid='paypal' , owner=teamowner.username , is_approved=random.sample(isapproved,1)[0] , receiving=0.1 diff --git a/tests/py/test_teams.py b/tests/py/test_teams.py index fbddbb95d4..7bbdaf74a2 100644 --- a/tests/py/test_teams.py +++ b/tests/py/test_teams.py @@ -13,9 +13,6 @@ class TestTeams(Harness): 'homepage': 'http://gratipay.com/', 'agree_terms': 'true', 'product_or_service': 'We make widgets.', - 'revenue_model': 'People pay us.', - 'getting_involved': 'People do stuff.', - 'getting_paid': 'We pay people.' } def post_new(self, data, auth_as='alice', expected=200): @@ -53,9 +50,6 @@ def test_all_fields_persist(self): assert team.name == 'Gratiteam' assert team.homepage == 'http://gratipay.com/' assert team.product_or_service == 'We make widgets.' - assert team.revenue_model == 'People pay us.' - assert team.getting_involved == 'People do stuff.' - assert team.getting_paid == 'We pay people.' def test_401_for_anon_creating_new_team(self): self.post_new(self.valid_data, auth_as=None, expected=401) diff --git a/www/%team/index.html.spt b/www/%team/index.html.spt index edf6661ed9..62c688f2ac 100644 --- a/www/%team/index.html.spt +++ b/www/%team/index.html.spt @@ -46,21 +46,6 @@ title = name = team.name
{{ markdown.render(team.product_or_service) }}
- -

{{ _("Revenue Model") }}

-
- {{ markdown.render(team.revenue_model) }} -
- -

{{ _("How to Get Involved") }}

-
- {{ markdown.render(team.getting_involved) }} -
- -

{{ _("How Revenue Is Shared") }}

-
- {{ markdown.render(team.getting_paid) }} -
{% endblock %} diff --git a/www/new.spt b/www/new.spt index 1c046118e8..efcc93e11f 100644 --- a/www/new.spt +++ b/www/new.spt @@ -65,18 +65,6 @@ title = _("Apply for a New Team")

{{ _("What product or service does your Team provide?") }}

- -

{{ _("How do you prompt your customers to financially support your Team's work?") }}

- - - -

{{ _("How can other people get involved with your Team?") }}

- - - -

{{ _("How do you share revenue with contributors?") }}

- -

diff --git a/www/teams/create.json.spt b/www/teams/create.json.spt index a0dac8d80a..df428b7819 100644 --- a/www/teams/create.json.spt +++ b/www/teams/create.json.spt @@ -10,9 +10,6 @@ field_names = { 'name': 'Team Name', 'homepage': 'Homepage', 'product_or_service': 'Product or Service', - 'revenue_model': 'Revenue Model', - 'getting_involved': 'Contributing', - 'getting_paid': 'Paying Contributors' } if user.ANON: