diff --git a/projects/admin.py b/projects/admin.py index 0cff389..63a806e 100644 --- a/projects/admin.py +++ b/projects/admin.py @@ -4,7 +4,6 @@ from .models import Project, Portfolio, PortfolioPhoto, \ Answer, Realty, Candidate, Order, Stage, Country, City,\ BuildingClassfication, ConstructionType - # class UserAdmin(admin.ModelAdmin): # readonly_fields = ('pk',) # list_display = ('email','is_active',) diff --git a/projects/forms.py b/projects/forms.py index dc90ee6..9a7819e 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -27,12 +27,15 @@ class RealtyForm(ModelForm): model = Realty fields = ( 'name', - # 'building_classification', - # 'construction_type', - # 'country', + 'building_classification', + 'construction_type', + 'country', # 'city', ) +class Realty1Form(Form): + pass + class PortfolioForm(ModelForm): class Meta: diff --git a/projects/templates/customer_project_create.html b/projects/templates/customer_project_create.html index e11c548..2835c3f 100644 --- a/projects/templates/customer_project_create.html +++ b/projects/templates/customer_project_create.html @@ -181,7 +181,7 @@
- diff --git a/projects/views.py b/projects/views.py index 5a54f17..4cb550c 100644 --- a/projects/views.py +++ b/projects/views.py @@ -5,7 +5,6 @@ from django.contrib.auth.mixins import PermissionRequiredMixin from django.views.generic import ListView, DetailView, CreateView, View, TemplateView from django.views.generic.edit import FormMixin - from users.models import User from .models import Project, Portfolio, Candidate, Answer, Realty from .forms import ProjectForm, PortfolioForm, AnswerForm, RealtyForm @@ -105,7 +104,7 @@ class TestView(View): def post(self, request, *args, **kwargs): form = self.form_class(request.POST) - second_form = self.form_second(request.POST,prefix='form_2') + second_form = self.form_second(request.POST, prefix='form_2') if form.is_valid() and second_form.is_valid(): return self.form_valid(request, form, second_form) return render(request, self.template_name, {'form': form, 'second_form': second_form}) @@ -120,9 +119,6 @@ class TestView(View): project.save() return HttpResponseRedirect('/projects/') - def form_invalid(self, form, second_form): - pass - class TestProjectView(View): model = Project @@ -169,7 +165,6 @@ class TestProjectView(View): realty_form=realty_form)) - class ProjectComparisonView(DetailView): model = Project template_name = 'comparison.html'