Browse Source

Tagy (MFIO) k problemum

remotes/origin/feincms
Tomas Gavenciak 10 years ago
parent
commit
1a6000f0e2
  1. 1
      mamweb/settings_common.py
  2. 1
      requirements.txt
  3. 22
      seminar/migrations/0007_problem_zamereni.py
  4. 3
      seminar/models.py

1
mamweb/settings_common.py

@ -98,6 +98,7 @@ INSTALLED_APPS = (
'django_countries', 'django_countries',
'solo', 'solo',
'ckeditor', 'ckeditor',
'taggit',
# MaMweb # MaMweb
'mamweb', 'mamweb',

1
requirements.txt

@ -18,6 +18,7 @@ django-countries==3.2
django-solo==1.1.0 django-solo==1.1.0
django-ckeditor==4.4.7 django-ckeditor==4.4.7
django-admin-tools==0.5.2 django-admin-tools==0.5.2
django-taggit==0.14.0
# debug tools/extensions # debug tools/extensions

22
seminar/migrations/0007_problem_zamereni.py

@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import taggit.managers
class Migration(migrations.Migration):
dependencies = [
('taggit', '0001_initial'),
('seminar', '0006_problem_add_timestamp'),
]
operations = [
migrations.AddField(
model_name='problem',
name='zamereni',
field=taggit.managers.TaggableManager(to='taggit.Tag', through='taggit.TaggedItem', blank=True, help_text=b'Zam\xc4\x9b\xc5\x99en\xc3\xad M/F/I/O probl\xc3\xa9mu, p\xc5\x99\xc3\xadp. dal\xc5\xa1\xc3\xad tagy', verbose_name='zam\u011b\u0159en\xed'),
preserve_default=True,
),
]

3
seminar/models.py

@ -14,6 +14,7 @@ from django.core.urlresolvers import reverse
from django_countries.fields import CountryField from django_countries.fields import CountryField
from solo.models import SingletonModel from solo.models import SingletonModel
from taggit.managers import TaggableManager
import reversion import reversion
@ -310,6 +311,8 @@ class Problem(SeminarModelBase):
] ]
stav = models.CharField(u'stav problému', max_length=32, choices=STAV_CHOICES, blank=False, default=STAV_NAVRH) stav = models.CharField(u'stav problému', max_length=32, choices=STAV_CHOICES, blank=False, default=STAV_NAVRH)
zamereni = TaggableManager(verbose_name=u'zaměření', help_text='Zaměření M/F/I/O problému, příp. další tagy', blank=True)
text_problemu_org = models.TextField(u'organizátorský (neveřejný) text', blank=True) text_problemu_org = models.TextField(u'organizátorský (neveřejný) text', blank=True)
text_problemu = models.TextField(u'veřejný text zadání a řešení', blank=True) text_problemu = models.TextField(u'veřejný text zadání a řešení', blank=True)

Loading…
Cancel
Save