diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py index 854f22e3c..d7835ec6f 100644 --- a/ietf/nomcom/forms.py +++ b/ietf/nomcom/forms.py @@ -609,13 +609,6 @@ class PendingFeedbackForm(BaseNomcomForm, forms.ModelForm): model = Feedback fields = ('type', ) - def __init__(self, *args, **kwargs): - super(PendingFeedbackForm, self).__init__(*args, **kwargs) - try: - self.default_type = FeedbackTypeName.objects.get(slug=settings.DEFAULT_FEEDBACK_TYPE) - except FeedbackTypeName.DoesNotExist: - self.default_type = None - def set_nomcom(self, nomcom, user): self.nomcom = nomcom self.user = user @@ -631,17 +624,6 @@ class PendingFeedbackForm(BaseNomcomForm, forms.ModelForm): feedback.save() return feedback - def move_to_default(self): - if not self.default_type or self.cleaned_data.get('type', None): - return None - feedback = super(PendingFeedbackForm, self).save(commit=False) - feedback.nomcom = self.nomcom - feedback.user = self.user - feedback.type = self.default_type - feedback.save() - return feedback - - class ReminderDatesForm(forms.ModelForm): class Meta: diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index 0440954de..518832c8e 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -656,24 +656,9 @@ def view_feedback_pending(request, year): extra=0) feedbacks = Feedback.objects.filter(type__isnull=True, nomcom=nomcom) - try: - default_type = FeedbackTypeName.objects.get(slug=settings.DEFAULT_FEEDBACK_TYPE) - except FeedbackTypeName.DoesNotExist: - default_type = None extra_step = False - if request.method == 'POST' and request.POST.get('move_to_default'): - formset = FeedbackFormSet(request.POST) - if formset.is_valid(): - for form in formset.forms: - form.set_nomcom(nomcom, request.user) - form.move_to_default() - formset = FeedbackFormSet(queryset=feedbacks) - for form in formset.forms: - form.set_nomcom(nomcom, request.user) - messages.success(request, 'Feedback saved') - return redirect('nomcom_view_feedback_pending', year=year) - elif request.method == 'POST' and request.POST.get('end'): + if request.method == 'POST' and request.POST.get('end'): extra_ids = request.POST.get('extra_ids', None) extra_step = True formset = FullFeedbackFormSet(request.POST) @@ -751,7 +736,6 @@ def view_feedback_pending(request, year): 'formset': formset, 'message': message, 'extra_step': extra_step, - 'default_type': default_type, 'type_dict': type_dict, 'extra_ids': extra_ids, 'types': FeedbackTypeName.objects.all().order_by('pk'), diff --git a/ietf/settings.py b/ietf/settings.py index 40aa1d207..f4ea228c3 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -455,7 +455,6 @@ NOMCOM_PUBLIC_KEYS_DIR = '/a/www/nomcom/public_keys/' NOMCOM_FROM_EMAIL = 'nomcom-chair@ietf.org' OPENSSL_COMMAND = '/usr/bin/openssl' DAYS_TO_EXPIRE_NOMINATION_LINK = '' -DEFAULT_FEEDBACK_TYPE = 'offtopic' NOMINEE_FEEDBACK_TYPES = ['comment', 'questio', 'nomina'] # ID Submission Tool settings diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html index 7302b7008..d4be2c183 100644 --- a/ietf/templates/nomcom/view_feedback_pending.html +++ b/ietf/templates/nomcom/view_feedback_pending.html @@ -149,9 +149,6 @@ {% buttons %} - {% if default_type %} - - {% endif %} {% endbuttons %} {% endif %}