From add219ccf824635b7222514c72479bd5abc6ee25 Mon Sep 17 00:00:00 2001
From: Tomas Gavenciak <gavento@ucw.cz>
Date: Sat, 14 Mar 2015 22:42:48 +0100
Subject: [PATCH] Clean up gitignore, minor fix admin, update README

---
 .gitignore                                   |   2 ++
 README.md                                    |   8 +++++++-
 seminar/admin.py                             |   4 ++--
 seminar/management/commands/.testdata.py.swp | Bin 16384 -> 0 bytes
 seminar/models.py                            |   4 ----
 5 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 seminar/management/commands/.testdata.py.swp

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 b6a2d787c34dbf8aa0e5837c380a385c2a65302a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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

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.