Drop revenue_model, getting_involved, getting_paid

In #3677 we decided not to use these questions anymore.
gratipay · Aug 19, 2015 · eef8d14 · eef8d14
1 parent 0087daf
commit eef8d14
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 44 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -46,21 +46,6 @@ title = name = team.name
     <div class="statement profile-statement">
         {{ markdown.render(team.product_or_service) }}
     </div>
-
-    <h2>{{ _("Revenue Model") }}</h2>
-    <div class="statement profile-statement">
-        {{ markdown.render(team.revenue_model) }}
-    </div>
-
-    <h2>{{ _("How to Get Involved") }}</h2>
-    <div class="statement profile-statement">
-        {{ markdown.render(team.getting_involved) }}
-    </div>
-
-    <h2>{{ _("How Revenue Is Shared") }}</h2>
-    <div class="statement profile-statement">
-        {{ markdown.render(team.getting_paid) }}
-    </div>
 </div>
 {% endblock %}
 

diff --git a/www/new.spt b/www/new.spt
@@ -65,18 +65,6 @@ title = _("Apply for a New Team")
     <p>{{ _("What product or service does your Team provide?") }}</p>
     <textarea name="product_or_service" required></textarea>
 
-    <label><h2>{{ _("Revenue Model") }}</h2></label>
-    <p>{{ _("How do you prompt your customers to financially support your Team's work?") }}</p>
-    <textarea name="revenue_model" required></textarea>
-
-    <label><h2>{{ _("Contributing") }}</h2></label>
-    <p>{{ _("How can other people get involved with your Team?") }}</p>
-    <textarea name="getting_involved" required></textarea>
-
-    <label><h2>{{ _("Paying Contributors") }}</h2></label>
-    <p>{{ _("How do you share revenue with contributors?") }}</p>
-    <textarea name="getting_paid" required></textarea>
-
     <br>
     <br>
     <input type="checkbox" value="true" name="agree_terms" id="agree_terms">

diff --git 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: