mirror of
git://git.yoctoproject.org/layerindex-web.git
synced 2025-07-19 20:59:01 +02:00
Rename SubmitLayerForm class to EditLayerForm
Remain consistent with other naming. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
parent
aa1dd0b822
commit
b3f0569640
|
@ -44,7 +44,7 @@ class BaseLayerMaintainerFormSet(forms.models.BaseInlineFormSet):
|
||||||
|
|
||||||
LayerMaintainerFormSet = inlineformset_factory(LayerItem, LayerMaintainer, form=LayerMaintainerForm, formset=BaseLayerMaintainerFormSet, can_delete=False, extra=10, max_num=10)
|
LayerMaintainerFormSet = inlineformset_factory(LayerItem, LayerMaintainer, form=LayerMaintainerForm, formset=BaseLayerMaintainerFormSet, can_delete=False, extra=10, max_num=10)
|
||||||
|
|
||||||
class SubmitLayerForm(forms.ModelForm):
|
class EditLayerForm(forms.ModelForm):
|
||||||
# Additional form fields
|
# Additional form fields
|
||||||
deps = forms.ModelMultipleChoiceField(label='Other layers this layer depends upon', queryset=LayerItem.objects.all(), required=False)
|
deps = forms.ModelMultipleChoiceField(label='Other layers this layer depends upon', queryset=LayerItem.objects.all(), required=False)
|
||||||
captcha = CaptchaField(label='Verification', help_text='Please enter the letters displayed for verification purposes', error_messages={'invalid':'Incorrect entry, please try again'})
|
captcha = CaptchaField(label='Verification', help_text='Please enter the letters displayed for verification purposes', error_messages={'invalid':'Incorrect entry, please try again'})
|
||||||
|
|
|
@ -12,7 +12,7 @@ from django.template import RequestContext
|
||||||
from layerindex.models import LayerItem, LayerMaintainer, LayerDependency, LayerNote, Recipe, Machine
|
from layerindex.models import LayerItem, LayerMaintainer, LayerDependency, LayerNote, Recipe, Machine
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from django.views.generic import DetailView, ListView
|
from django.views.generic import DetailView, ListView
|
||||||
from layerindex.forms import SubmitLayerForm, LayerMaintainerFormSet, EditNoteForm
|
from layerindex.forms import EditLayerForm, LayerMaintainerFormSet, EditNoteForm
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.contrib.auth.models import User, Permission
|
from django.contrib.auth.models import User, Permission
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
@ -87,7 +87,7 @@ def edit_layer_view(request, template_name, slug=None):
|
||||||
layeritem = LayerItem()
|
layeritem = LayerItem()
|
||||||
|
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = SubmitLayerForm(request.user, request.POST, instance=layeritem)
|
form = EditLayerForm(request.user, request.POST, instance=layeritem)
|
||||||
maintainerformset = LayerMaintainerFormSet(request.POST, instance=layeritem)
|
maintainerformset = LayerMaintainerFormSet(request.POST, instance=layeritem)
|
||||||
if form.is_valid() and maintainerformset.is_valid():
|
if form.is_valid() and maintainerformset.is_valid():
|
||||||
with transaction.commit_on_success():
|
with transaction.commit_on_success():
|
||||||
|
@ -131,7 +131,7 @@ def edit_layer_view(request, template_name, slug=None):
|
||||||
return HttpResponseRedirect(reverse('submit_layer_thanks'))
|
return HttpResponseRedirect(reverse('submit_layer_thanks'))
|
||||||
form.was_saved = True
|
form.was_saved = True
|
||||||
else:
|
else:
|
||||||
form = SubmitLayerForm(request.user, instance=layeritem)
|
form = EditLayerForm(request.user, instance=layeritem)
|
||||||
maintainerformset = LayerMaintainerFormSet(instance=layeritem)
|
maintainerformset = LayerMaintainerFormSet(instance=layeritem)
|
||||||
|
|
||||||
return render(request, template_name, {
|
return render(request, template_name, {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user