diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-22 20:54:01 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-22 20:54:01 +0200 |
| commit | f1d4e11b8acd97cbf29bc1e0b3e99c75a5b51f3a (patch) | |
| tree | 93e1f9499c0934d00459f901382980980a36928d | |
| parent | d9f1adb4e7164dfede3551822b9184bef9f9df85 (diff) | |
| download | Ishtar-f1d4e11b8acd97cbf29bc1e0b3e99c75a5b51f3a.tar.bz2 Ishtar-f1d4e11b8acd97cbf29bc1e0b3e99c75a5b51f3a.zip | |
Minor update on doc - Fix import script
| -rw-r--r-- | docs/source/installation.rst | 2 | ||||
| -rw-r--r-- | example_project/settings.py | 7 | ||||
| -rwxr-xr-x | ishtar_common/scripts/import_from_csv.py | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 4eb5760f9..023628193 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -44,7 +44,7 @@ For instance the packages for Debian wheezy are get with:: $ apt-get install apache2 python python-django python-psycopg2 gettext \ postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \ python-pisa python-django-registration python-utidylib python-lxml \ - python-imaging + python-imaging git python-django-south python-psycopg2 If these packages do not exist in your distribution's repository, please refer to applications websites. diff --git a/example_project/settings.py b/example_project/settings.py index f8d188b23..d30219452 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -63,11 +63,6 @@ MEDIA_ROOT = ROOT_PATH + 'media/' # Examples: "http://media.lawrence.com", "http://example.com/media/" MEDIA_URL = '/media/' -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/media/' - # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', @@ -116,7 +111,7 @@ INSTALLED_APPS = [ 'registration', 'ishtar_common', 'archaeological_operations', # mandatory app to run ishtar - 'django_extensions', + #'django_extensions', #'debug_toolbar', ] diff --git a/ishtar_common/scripts/import_from_csv.py b/ishtar_common/scripts/import_from_csv.py index de916be6f..47f20f819 100755 --- a/ishtar_common/scripts/import_from_csv.py +++ b/ishtar_common/scripts/import_from_csv.py @@ -19,13 +19,13 @@ setup_environ(settings) from optparse import OptionParser -from ishtar_base import models +from ishtar_common import models def insert_department(value): idx, label = value - if models.Departement.objects.filter(number=idx).count(): + if models.Department.objects.filter(number=idx).count(): return - models.Departement(number=idx, label=label).save() + models.Department(number=idx, label=label).save() print idx, label, u" inserted" def insert_town(value): |