aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkotibold2011-06-25 13:08:46 +0200
committermarkotibold2011-06-25 13:08:46 +0200
commitddd36206bc7a403b2ba43de7b4c43d5bf6466399 (patch)
tree82c90b5b8012466a36748c6b542e2be949820129
parent409ee533fd28b742f4e790dc56aa686f44db1fcd (diff)
downloaddjango-rest-framework-ddd36206bc7a403b2ba43de7b4c43d5bf6466399.tar.bz2
Added a fixture so that the users default have a user to login with and play with permissions.
-rw-r--r--examples/permissionsexample/fixtures/initial_data.yaml12
-rw-r--r--examples/permissionsexample/models.py1
-rw-r--r--examples/permissionsexample/urls.py2
-rw-r--r--examples/requirements.txt1
-rw-r--r--examples/settings.py7
5 files changed, 22 insertions, 1 deletions
diff --git a/examples/permissionsexample/fixtures/initial_data.yaml b/examples/permissionsexample/fixtures/initial_data.yaml
new file mode 100644
index 00000000..22276ec2
--- /dev/null
+++ b/examples/permissionsexample/fixtures/initial_data.yaml
@@ -0,0 +1,12 @@
+- fields:
+ first_name: ''
+ groups: []
+ is_active: true
+ is_staff: true
+ is_superuser: true
+ last_name: ''
+ password: sha1$b3dff$671b4ab97f2714446da32670d27576614e176758
+ user_permissions: []
+ username: test
+ model: auth.user
+ pk: 2
diff --git a/examples/permissionsexample/models.py b/examples/permissionsexample/models.py
new file mode 100644
index 00000000..232085ad
--- /dev/null
+++ b/examples/permissionsexample/models.py
@@ -0,0 +1 @@
+#for fixture loading \ No newline at end of file
diff --git a/examples/permissionsexample/urls.py b/examples/permissionsexample/urls.py
index d17f5159..e3b0ffbd 100644
--- a/examples/permissionsexample/urls.py
+++ b/examples/permissionsexample/urls.py
@@ -2,5 +2,5 @@ from django.conf.urls.defaults import patterns, url
from permissionsexample.views import ThrottlingExampleView
urlpatterns = patterns('',
- url(r'^$', ThrottlingExampleView.as_view(), name='throttled-resource'),
+ url(r'^$', ThrottlingExampleView.as_view(), name='throttled-resource'),
)
diff --git a/examples/requirements.txt b/examples/requirements.txt
index 09cda945..19d37673 100644
--- a/examples/requirements.txt
+++ b/examples/requirements.txt
@@ -5,4 +5,5 @@ wsgiref==0.1.2
Pygments==1.4
httplib2==0.6.0
Markdown==2.0.3
+Pyyaml
diff --git a/examples/settings.py b/examples/settings.py
index 1537c5f8..2eab2cfa 100644
--- a/examples/settings.py
+++ b/examples/settings.py
@@ -89,6 +89,12 @@ TEMPLATE_DIRS = (
# Don't forget to use absolute paths, not relative paths.
)
+# for loading initial data
+##SERIALIZATION_MODULES = {
+ # 'yml': "django.core.serializers.pyyaml"
+
+#}
+
INSTALLED_APPS = (
'django.contrib.auth',
@@ -104,6 +110,7 @@ INSTALLED_APPS = (
'objectstore',
'pygments_api',
'blogpost',
+ 'permissionsexample',
)
import os