--- a/src/ldt/ldt/ldt_utils/migrations/0005_add_permissions.py Tue Dec 13 15:46:34 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/migrations/0005_add_permissions.py Wed Dec 14 10:28:50 2011 +0100
@@ -16,16 +16,23 @@
for model in ["project", "content", "segment", "author", "media"]:
self.add_perm(orm, model)
-
+
everyone = Group.objects.create(name=settings.PUBLIC_GROUP_NAME)
for proj in Project.objects.all():
- assign('ldt_utils.change_project', proj.owner)
- assign('ldt_utils.view_project', proj.owner)
+ assign('ldt_utils.change_project', proj.owner, proj)
+ assign('ldt_utils.view_project', proj.owner, proj)
+
+ for published_proj in Project.objects.filter(state=2):
+ assign('ldt_utils.view_project', everyone, published_proj)
for user in User.objects.all():
user.groups.add(everyone)
+ for group in user.groups.exclude(name=settings.PUBLIC_GROUP_NAME):
+ for proj in Project.objects.filter(owner=user):
+ assign('ldt_utils.view_project', group, proj)
+
checker = ObjectPermissionChecker(user)
for content in Content.objects.all():
if checker.has_perm('view_content', content):
--- a/src/ldt/ldt/ldt_utils/views.py Tue Dec 13 15:46:34 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/views.py Wed Dec 14 10:28:50 2011 +0100
@@ -1148,6 +1148,7 @@
def write_content(request, iri_id=None):
submit_action = request.REQUEST.get("submit_button", False)
groups = request.user.groups.exclude(name=settings.PUBLIC_GROUP_NAME)
+ member_list = admin_list = []
if submit_action == "prepare_delete":
errors, titles = prepare_delete_content(request, iri_id)
@@ -1165,12 +1166,12 @@
media_form = MediaForm()
else:
content_form, media_form, form_status = write_content_base(request, iri_id)
+ if iri_id:
+ member_list, admin_list = get_userlist_model(Content.objects.get(iri_id=iri_id), request.user)
if iri_id:
create_content_action = reverse('ldt.ldt_utils.views.write_content', kwargs={'iri_id':iri_id})
- member_list, admin_list = get_userlist_model(Content.objects.get(iri_id=iri_id), request.user)
- else:
- member_list = admin_list = []
+ else:
create_content_action = reverse('ldt.ldt_utils.views.write_content')
session_key = request.COOKIES[settings.SESSION_COOKIE_NAME]
--- a/web/ldtplatform/config.py.tmpl Tue Dec 13 15:46:34 2011 +0100
+++ b/web/ldtplatform/config.py.tmpl Wed Dec 14 10:28:50 2011 +0100
@@ -51,8 +51,7 @@
CACHES = {
'default': {
- 'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
- 'LOCATION': 'cache',
+ 'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
}
}