remotes/origin/editis_13-01-19
gzbender 7 years ago
parent c65e1ac69e
commit 30766116da
  1. 2
      apps/user/forms.py
  2. 18
      apps/user/migrations/0026_user_site.py
  3. 1
      apps/user/models.py
  4. 11
      apps/user/templates/user/profile-settings.html
  5. 2
      web/src/components/CourseRedactor.vue

@ -28,6 +28,7 @@ class UserEditForm(forms.ModelForm):
pinterest = forms.URLField(required=False)
youtube = forms.URLField(required=False)
vkontakte = forms.URLField(required=False)
site = forms.URLField(required=False)
photo = forms.ImageField(required=False)
class Meta:
@ -53,6 +54,7 @@ class UserEditForm(forms.ModelForm):
'pinterest',
'youtube',
'vkontakte',
'site',
'photo',
)

@ -0,0 +1,18 @@
# Generated by Django 2.0.6 on 2018-11-15 09:52
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('user', '0025_merge_20180927_2353'),
]
operations = [
migrations.AddField(
model_name='user',
name='site',
field=models.URLField(blank=True, default='', null=True),
),
]

@ -70,6 +70,7 @@ class User(AbstractUser):
pinterest = models.URLField(default='', null=True, blank=True)
youtube = models.URLField(default='', null=True, blank=True)
vkontakte = models.URLField('ВКонтакте', default='', null=True, blank=True)
site = models.URLField(default='', null=True, blank=True)
fb_id = models.BigIntegerField(null=True, blank=True, unique=True)
fb_data = pgfields.JSONField(default={}, null=True, blank=True)
is_email_proved = models.BooleanField(

@ -255,7 +255,16 @@
{% for error in form.vkontakte.errors %}
<div class="field__error">{{ error }}</div>
{% endfor %}
</div>
</div>
<div class="form__field field{% if form.site.errors %} error{% endif %}">
<div class="field__label">САЙТ</div>
<div class="field__wrap">
<input name='site' class="field__input" type="text" placeholder="https://site.com" value="{% if user.site %}{{ user.site }}{% endif %}">
</div>
{% for error in form.site.errors %}
<div class="field__error">{{ error }}</div>
{% endfor %}
</div>
</div>
<div class="form__foot">
<button type="submit" class="form__btn btn btn_md">СОХРАНИТЬ</button>

@ -155,7 +155,7 @@
</div>
<div class="section">
<div class="section__center center">
<div class="kit">
<div class="kit" style="margin: 0 auto;">
<div v-if="!live" id="course-redactor__nav" class="kit__nav">
<button class="kit__btn btn btn_lg"
v-bind:class="{ 'btn_stroke': viewSection === 'course', 'btn_gray': viewSection !== 'course' }"

Loading…
Cancel
Save