Merge branch 'fixes'

callowayproject · Aug 29, 2011 · 0b57dfa · 0b57dfa
2 parents 5942ce1 + e03687a
commit 0b57dfa
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 17 deletions.
diff --git a/README.rst b/README.rst
@@ -19,18 +19,14 @@ Make sure you have `virtualenvwrapper`_ installed and create a virtual environme
 .. _virtualenvwrapper: http://www.doughellmann.com/docs/virtualenvwrapper/
 
 Install the requirements::
-    
+
     pip install -r requirements.txt
 
-Synchronize the database::
+Synchronize the database and load the dummy data::
 
     cd example
     ./manage.py syncdb
 
-Load up some dummy data::
-
-    ./manage.py loaddata dev_data.json
-
 Synchronize the dummy data::
 
     ./manage.py feedmapper_sync
@@ -39,7 +35,8 @@ Fire up the development server::
 
     ./manage.py runserver
 
-Check out the sync results in the admin at http://localhost:8000/admin/myapp/thing/.
+Check out the feed mapping in the admin at http://localhost:8000/admin/feedmapper/mapping/1/
+and the sync results in the admin at http://localhost:8000/admin/myapp/thing/.
 
 Full documentation
 ******************

diff --git a/feedmapper/fixtures/dev_data.json → example/myapp/fixtures/initial_data.json b/feedmapper/fixtures/dev_data.json → example/myapp/fixtures/initial_data.json
diff --git a/feedmapper/fields.py b/feedmapper/fields.py
@@ -29,7 +29,7 @@ def default(self, obj):
 
 def dumps(value):
     assert isinstance(value, dict)
-    return JSONEncoder().encode(value)
+    return JSONEncoder(indent=4).encode(value)
 
 
 def loads(txt):

diff --git a/feedmapper/forms.py b/feedmapper/forms.py
diff --git a/feedmapper/static/placeholder.txt b/feedmapper/static/placeholder.txt
diff --git a/feedmapper/templatetags/__init__.py b/feedmapper/templatetags/__init__.py
diff --git a/feedmapper/templatetags/feedmapper_tags.py b/feedmapper/templatetags/feedmapper_tags.py
diff --git a/feedmapper/urls.py b/feedmapper/urls.py
diff --git a/feedmapper/views.py b/feedmapper/views.py