Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove description field from project forms and display #3754

Closed
wants to merge 3 commits into from
+1 −20
Closed

Remove description field from project forms and display #3754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50f35d8
remove description field from forms and display
bansalnitish Mar 12, 2018
b36c0f3
Merge branch 'master' into desc-rm
ericholscher May 22, 2018
5057a66
Merge branch 'master' into desc-rm
ericholscher Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions readthedocs/projects/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,20 +168,13 @@ class ProjectExtraForm(ProjectForm):
class Meta(object):
model = Project
fields = (
'description',
'documentation_type',
'language',
'programming_language',
'tags',
'project_url',
)

description = forms.CharField(
validators=[ClassifierValidator(raises=ProjectSpamError)],
required=False,
widget=forms.Textarea,
)


class ProjectAdvancedForm(ProjectTriggerBuildMixin, ProjectForm):

Expand Down Expand Up @@ -256,7 +249,6 @@ class Meta(object):
'repo',
'repo_type',
# Extra
'description',
'documentation_type',
'language',
'programming_language',
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/projects/views/private.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ def post(self, request, *args, **kwargs):
for key in ['name', 'repo', 'repo_type', 'remote_repository']:
initial_data['basics'][key] = request.POST.get(key)
initial_data['extra'] = {}
for key in ['description', 'project_url']:
for key in ['project_url']:
initial_data['extra'][key] = request.POST.get(key)
request.method = 'GET'
return self.wizard_class.as_view(initial_dict=initial_data)(request)
Expand Down
2 changes: 0 additions & 2 deletions readthedocs/rtd_tests/tests/test_project_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ def setUp(self):
'repo_type': 'git',
},
'extra': {
'description': 'Describe foobar',
'language': 'en',
'documentation_type': 'sphinx',
},
Expand Down Expand Up @@ -149,7 +148,6 @@ def setUp(self):
super(TestAdvancedForm, self).setUp()
self.step_data['basics']['advanced'] = True
self.step_data['extra'] = {
'description': 'Describe foobar',
'language': 'en',
'documentation_type': 'sphinx',
'tags': 'foo, bar, baz',
Expand Down
9 changes: 0 additions & 9 deletions readthedocs/templates/core/project_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,6 @@ <h3>{% trans "Build a version" %}</h3>
{% endif %}
{% endblock %}

{% if project.description %}
<div id="project_description">
<h3>{% trans "Description" %}</h3>
<p>
{{ project.description|restructuredtext }}
</p>
</div>
{% endif %}

</div>{# END .module #}

<div class="project_details">
Expand Down