PR-68 Корректировка в настройках профиля Заказчика

У Заказчика поле "статус" --> "Место работы"
remotes/origin/HEAD
booblegum 9 years ago
parent 50915851a1
commit 6a5430c582
  1. 1
      users/forms.py
  2. 20
      users/migrations/0022_user_organization_name.py
  3. 1
      users/models.py
  4. 4
      users/static/css/user_profile_edit.css
  5. 9
      users/templates/user_profile_edit.html

@ -70,6 +70,7 @@ class UserProfileEditFullForm(forms.ModelForm):
'last_name', 'last_name',
'patronym', 'patronym',
'location', 'location',
'organization_name',
'contractor_specializations', # Специализации 'contractor_specializations', # Специализации
'contractor_building_classifications', # Классификация зданий 'contractor_building_classifications', # Классификация зданий
'contractor_construction_types', # Вид строительства 'contractor_construction_types', # Вид строительства

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.7 on 2017-01-04 12:54
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0021_user_raw_password'),
]
operations = [
migrations.AddField(
model_name='user',
name='organization_name',
field=models.CharField(blank=True, max_length=64, verbose_name='Место работы'),
),
]

@ -150,6 +150,7 @@ class User(AbstractBaseUser, PermissionsMixin):
last_name = models.CharField(max_length=255, blank=True) last_name = models.CharField(max_length=255, blank=True)
last_time_visit = models.DateTimeField(default=timezone.now) last_time_visit = models.DateTimeField(default=timezone.now)
location = TreeForeignKey('common.Location', related_name='users', null=True, blank=True) location = TreeForeignKey('common.Location', related_name='users', null=True, blank=True)
organization_name = models.CharField(max_length=64, blank=True, verbose_name="Место работы")
patronym = models.CharField(max_length=255, blank=True) patronym = models.CharField(max_length=255, blank=True)
phone = models.CharField(max_length=30, blank=True, null=True) phone = models.CharField(max_length=30, blank=True, null=True)
phone2 = models.CharField(max_length=30, blank=True, null=True) phone2 = models.CharField(max_length=30, blank=True, null=True)

@ -26,6 +26,10 @@
margin-bottom: -1px; margin-bottom: -1px;
} }
.simple-input:-webkit-autofill, .simple-select:-webkit-autofill{
transition: background-color 5000s ease-in-out 0s
}
.simple-select select { .simple-select select {
background-color: darkgray; background-color: darkgray;
} }

@ -255,6 +255,7 @@
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
{% if request.user.is_contractor %}
<div style="position: relative" class="select-box-container custom-select" <div style="position: relative" class="select-box-container custom-select"
id="gender"> id="gender">
<div class="select-box-header"> <div class="select-box-header">
@ -274,6 +275,14 @@
</div> </div>
</div> </div>
</div> </div>
{% else %}
<div class="header">{{ form.organization_name.label }}</div>
<input name="organization_name" class="simple-input"
placeholder="Название организации"
{# autocomplete="False"#}
value="{{ form.organization_name.value }}">
{% endif %}
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<div class="header">Skype</div> <div class="header">Skype</div>

Loading…
Cancel
Save