diff --git a/ietf/secr/groups/forms.py b/ietf/secr/groups/forms.py index c002b3b30..af4dfd63e 100644 --- a/ietf/secr/groups/forms.py +++ b/ietf/secr/groups/forms.py @@ -3,7 +3,7 @@ import re from django import forms from django.db.models import Count -from ietf.group.models import Group, GroupMilestone, Role +from ietf.group.models import Group, Role from ietf.name.models import GroupStateName, GroupTypeName, RoleName from ietf.person.models import Person, Email from ietf.liaisons.models import LiaisonStatementGroupContacts @@ -47,29 +47,6 @@ def get_parent_group_choices(): class DescriptionForm (forms.Form): description = forms.CharField(widget=forms.Textarea(attrs={'rows':'20'}),required=True, strip=False) -class GroupMilestoneForm(forms.ModelForm): - class Meta: - model = GroupMilestone - exclude = ('done',) - - # use this method to set attrs which keeps other meta info from model. - def __init__(self, *args, **kwargs): - super(GroupMilestoneForm, self).__init__(*args, **kwargs) - self.fields['desc'].widget=forms.TextInput(attrs={'size':'60'}) - self.fields['expected_due_date'].widget.attrs['size'] = 10 - self.fields['done_date'].widget.attrs['size'] = 10 - - # override save. set done=True if done_date set - def save(self, force_insert=False, force_update=False, commit=True): - m = super(GroupMilestoneForm, self).save(commit=False) - if 'done_date' in self.changed_data: - if self.cleaned_data.get('done_date',''): - m.done = True - else: - m.done = False - if commit: - m.save() - return m class GroupModelForm(forms.ModelForm): type = forms.ModelChoiceField(queryset=GroupTypeName.objects.all(),empty_label=None) diff --git a/ietf/secr/groups/urls.py b/ietf/secr/groups/urls.py index 8dcb5d46b..f19a3efc2 100644 --- a/ietf/secr/groups/urls.py +++ b/ietf/secr/groups/urls.py @@ -13,7 +13,5 @@ urlpatterns = [ url(r'^%(acronym)s/delete/(?P\d{1,6})/$' % settings.URL_REGEXPS, views.delete_role), url(r'^%(acronym)s/charter/$' % settings.URL_REGEXPS, views.charter), url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, views.edit), - url(r'^%(acronym)s/gm/$' % settings.URL_REGEXPS, views.view_gm), - url(r'^%(acronym)s/gm/edit/$' % settings.URL_REGEXPS, views.edit_gm), url(r'^%(acronym)s/people/$' % settings.URL_REGEXPS, views.people), ] diff --git a/ietf/secr/groups/views.py b/ietf/secr/groups/views.py index 6c0d46cb3..ad3ac8ff7 100644 --- a/ietf/secr/groups/views.py +++ b/ietf/secr/groups/views.py @@ -3,11 +3,11 @@ from django.conf import settings from django.forms.models import inlineformset_factory from django.shortcuts import render, get_object_or_404, redirect -from ietf.group.models import Group, GroupMilestone, ChangeStateGroupEvent, GroupEvent, GroupURL, Role +from ietf.group.models import Group, ChangeStateGroupEvent, GroupEvent, GroupURL, Role from ietf.group.utils import save_group_in_history, get_charter_text, setup_default_community_list_for_group from ietf.ietfauth.utils import role_required from ietf.person.models import Person -from ietf.secr.groups.forms import GroupModelForm, GroupMilestoneForm, RoleForm, SearchForm +from ietf.secr.groups.forms import GroupModelForm, RoleForm, SearchForm from ietf.secr.areas.forms import AWPForm from ietf.secr.utils.meeting import get_current_meeting @@ -278,41 +278,6 @@ def edit(request, acronym): 'form': form}, ) -@role_required('Secretariat') -def edit_gm(request, acronym): - """ - Edit IETF Group Goal and Milestone details - - **Templates:** - - * ``groups/edit_gm.html`` - - **Template Variables:** - - * group, formset - - """ - - group = get_object_or_404(Group, acronym=acronym) - GMFormset = inlineformset_factory(Group, GroupMilestone, form=GroupMilestoneForm, can_delete=True, extra=5) - - if request.method == 'POST': - button_text = request.POST.get('submit', '') - if button_text == 'Cancel': - return redirect('ietf.secr.groups.views.view', acronym=acronym) - - formset = GMFormset(request.POST, instance=group, prefix='goalmilestone') - if formset.is_valid(): - formset.save() - messages.success(request, 'The Goals Milestones were changed successfully') - return redirect('ietf.secr.groups.views.view', acronym=acronym) - else: - formset = GMFormset(instance=group, prefix='goalmilestone') - - return render(request, 'groups/edit_gm.html', { - 'group': group, - 'formset': formset}, - ) @role_required('Secretariat') def people(request, acronym): @@ -460,21 +425,3 @@ def view(request, acronym): return render(request, 'groups/view.html', { 'group': group } ) -@role_required('Secretariat') -def view_gm(request, acronym): - """ - View IETF Group Goals and Milestones details - - **Templates:** - - * ``groups/view_gm.html`` - - **Template Variables:** - - * group - - """ - - group = get_object_or_404(Group, acronym=acronym) - - return render(request, 'groups/view_gm.html', { 'group': group } ) diff --git a/ietf/secr/templates/groups/edit_gm.html b/ietf/secr/templates/groups/edit_gm.html deleted file mode 100644 index 0eee1895b..000000000 --- a/ietf/secr/templates/groups/edit_gm.html +++ /dev/null @@ -1,64 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} - -{% block title %}Groups - Edit{% endblock %} - -{% block extrahead %}{{ block.super }} - - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Groups - » {{ group.acronym }} - » Goals and Milestones - » Edit -{% endblock %} - -{% block content %} - -
-
{% csrf_token %} - -
-
-

Goals and Milestones

- {{ formset.management_form }} - {{ formset.non_form_errors }} - - - {% for field in formset.forms.0.visible_fields %} - - {% endfor %} - - - - {% for form in formset.forms %} - {% if form.non_field_errors %} - - {% endif %} - - - {% for hidden in form.hidden_fields %} - {{ hidden }} - {% endfor %} - {% for field in form.visible_fields %} - - {% endfor %} - - {% endfor %} - -
{{ field.label|capfirst }}
{{ form.non_field_errors }}
- {{ field.errors }} - {{ field }} -
-
-
- - {% include "includes/buttons_save_cancel.html" %} - -
-
- - -{% endblock %} diff --git a/ietf/secr/templates/groups/view.html b/ietf/secr/templates/groups/view.html index 380062307..f64eb4ea3 100644 --- a/ietf/secr/templates/groups/view.html +++ b/ietf/secr/templates/groups/view.html @@ -106,7 +106,6 @@