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 f37bb23..46b9790 100644 --- a/projects/views.py +++ b/projects/views.py @@ -106,7 +106,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}) @@ -121,9 +121,50 @@ class TestView(View): project.save() return HttpResponseRedirect('/projects/') - def form_invalid(self, form, second_form): - pass +class TestProjectView(View): + model = Project + form_class = ProjectForm + template_name = 'test.html' + success_url = '/projects/' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['realty_form'] = RealtyForm(prefix='form_2') + return context + + # def get(self, request, *args, **kwargs): + # self.object = None + + def post(self, request, *args, **kwargs): + self.object = None + form_class = self.get_form_class() + form = self.get_form(form_class) + realty_form = RealtyForm(self.request.POST) + # import code; code.interact(local=dict(globals(), **locals())) + if form.is_valid(): + return self.form_valid(form, realty_form) + else: + return self.form_invalid(form, realty_form) + + + def form_valid(self, form, realty_form): + status = 'form_valid' + + realty = realty_form.instance + realty.user = self.request.user + realty.save() + project = form.instance + project.user = self.request.user + project.realty = realty + project.save() + # import code; code.interact(local=dict(globals(), **locals())) + + def form_invalid(self, form, realty_form): + status = 'form_invalid' + return self.render_to_response( + self.get_context_data(form=form, + realty_form=realty_form)) class ProjectComparisonView(DetailView):