diff --git a/.gitignore b/.gitignore index 7e1a3211..1131ac78 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,9 @@ local/ share/ virtualenv/ pip-selfcheck.json +db-local.sqlite3* /static /media *.pyc +*.swp diff --git a/README.md b/README.md index 87f51b71..a8f3bdcb 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,14 @@ When working with the code, always use the binaries in `./bin/`, such as `bin/pip`, `bin/python`, ... never the global python, pip, ... Use `make` and `./manage.py` for most things. -Use git. +Use git :-) +Quickstart +---------- + + make + ./manage.py testdata + make run Make commands ------------- diff --git a/seminar/admin.py b/seminar/admin.py index aadf7562..2fe2c4ae 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -120,13 +120,13 @@ class ProblemAdmin(admin.ModelAdmin): form = ProblemAdminForm # readonly_fields = ['autor'] fieldsets = [ - (None, {'fields': ['nazev', 'typ', 'stav', 'autor']}), + (None, {'fields': ['nazev', 'typ', 'stav', 'autor', 'body']}), (u'Vydání', {'fields': ['cislo_zadani', 'kod', 'cislo_reseni', 'opravovatel']}), (u'Texty', {'fields': ['text_problemu', 'text_problemu_org']}), ] list_display = ['nazev', 'typ', 'stav', 'autor', 'kod', 'opravovatel'] list_filter = ['typ', 'stav', 'autor', 'opravovatel'] - search_fields = ['nazev', 'autor', 'kod', 'text_problemu_org', 'text_problemu'] + search_fields = ['nazev', 'kod', 'text_problemu_org', 'text_problemu'] inlines = [ReseniInline] admin.site.register(Problem, ProblemAdmin) diff --git a/seminar/management/commands/.testdata.py.swp b/seminar/management/commands/.testdata.py.swp deleted file mode 100644 index b6a2d787..00000000 Binary files a/seminar/management/commands/.testdata.py.swp and /dev/null differ diff --git a/seminar/models.py b/seminar/models.py index 42ce27e5..dc393344 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -13,10 +13,6 @@ from django.utils.encoding import force_unicode from django_countries.fields import CountryField from solo.models import SingletonModel -from ckeditor.fields import RichTextField -from redactor.fields import RedactorField - - # # Mělo by být částečně vytaženo z Aesopa # viz https://ovvp.mff.cuni.cz/wiki/aesop/export-skol.