add admin changes for projects

remotes/origin/setup
Mukhtar 10 years ago
parent ef774ad3e3
commit fc3c3bb343
  1. 1
      projects/admin.py
  2. 9
      projects/forms.py
  3. 2
      projects/templates/customer_project_create.html
  4. 7
      projects/views.py

@ -4,7 +4,6 @@ from .models import Project, Portfolio, PortfolioPhoto, \
Answer, Realty, Candidate, Order, Stage, Country, City,\ Answer, Realty, Candidate, Order, Stage, Country, City,\
BuildingClassfication, ConstructionType BuildingClassfication, ConstructionType
# class UserAdmin(admin.ModelAdmin): # class UserAdmin(admin.ModelAdmin):
# readonly_fields = ('pk',) # readonly_fields = ('pk',)
# list_display = ('email','is_active',) # list_display = ('email','is_active',)

@ -27,12 +27,15 @@ class RealtyForm(ModelForm):
model = Realty model = Realty
fields = ( fields = (
'name', 'name',
# 'building_classification', 'building_classification',
# 'construction_type', 'construction_type',
# 'country', 'country',
# 'city', # 'city',
) )
class Realty1Form(Form):
pass
class PortfolioForm(ModelForm): class PortfolioForm(ModelForm):
class Meta: class Meta:

@ -181,7 +181,7 @@
</select> </select>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<select class="selectpicker" name="{{ form_realty.type_construction }}"> <select class="selectpicker" name="{{ form_realty.type_construction.name }}">
<option>Mustard</option> <option>Mustard</option>
<option>Ketchup</option> <option>Ketchup</option>
<option>Relish</option> <option>Relish</option>

@ -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 import ListView, DetailView, CreateView, View, TemplateView
from django.views.generic.edit import FormMixin from django.views.generic.edit import FormMixin
from users.models import User from users.models import User
from .models import Project, Portfolio, Candidate, Answer, Realty from .models import Project, Portfolio, Candidate, Answer, Realty
from .forms import ProjectForm, PortfolioForm, AnswerForm, RealtyForm from .forms import ProjectForm, PortfolioForm, AnswerForm, RealtyForm
@ -105,7 +104,7 @@ class TestView(View):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
form = self.form_class(request.POST) 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(): if form.is_valid() and second_form.is_valid():
return self.form_valid(request, form, second_form) return self.form_valid(request, form, second_form)
return render(request, self.template_name, {'form': form, 'second_form': second_form}) return render(request, self.template_name, {'form': form, 'second_form': second_form})
@ -120,9 +119,6 @@ class TestView(View):
project.save() project.save()
return HttpResponseRedirect('/projects/') return HttpResponseRedirect('/projects/')
def form_invalid(self, form, second_form):
pass
class TestProjectView(View): class TestProjectView(View):
model = Project model = Project
@ -169,7 +165,6 @@ class TestProjectView(View):
realty_form=realty_form)) realty_form=realty_form))
class ProjectComparisonView(DetailView): class ProjectComparisonView(DetailView):
model = Project model = Project
template_name = 'comparison.html' template_name = 'comparison.html'

Loading…
Cancel
Save