src/ldt/ldt/ldt_utils/views.py
changeset 232 2878499a372b
parent 231 535ce952e51c
child 233 f6d009f83e38
--- a/src/ldt/ldt/ldt_utils/views.py	Fri Nov 04 10:31:47 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/views.py	Fri Nov 04 16:45:40 2011 +0100
@@ -21,7 +21,6 @@
 from guardian.shortcuts import assign, remove_perm
 from ldt.ldt_utils.models import Content
 from ldt.ldt_utils.utils import boolean_convert, LdtUtils, LdtSearch
-from ldt.ldt_utils.security import group_security
 from lxml.html import fragment_fromstring
 from models import Media, Project
 from projectserializer import ProjectSerializer
@@ -42,7 +41,6 @@
 import datetime
 
 @login_required
-@group_security
 def workspace(request):
     
     # list of contents
@@ -61,7 +59,6 @@
 
 
 @login_required
-@group_security
 def groups(request):
 
     # get list of all published projects
@@ -77,7 +74,6 @@
 
 
 @login_required
-@group_security
 def published_project(request):
 
     # get list of all published projects
@@ -201,7 +197,6 @@
 
 
 @login_required
-@group_security
 def search_index(request):
         
     sform = SearchForm(request.POST)
@@ -697,11 +692,9 @@
     return render_to_response('ldt/ldt_utils/save_done.html', {'ldt': ldt, 'id':id, 'title':ldtproject.title, 'contents': new_contents}, context_instance=RequestContext(request))
 
 @login_required
-@group_security
 def publish(request, id, redirect=True):
     ldt = get_object_or_404(Project, ldt_id=id)
-    ldt.state = 2 #published
-    ldt.save()
+    ldt.publish()
     redirect = boolean_convert(redirect)
     if redirect:
         return HttpResponseRedirect(reverse("ldt.ldt_utils.views.list_ldt"))
@@ -709,11 +702,9 @@
         return HttpResponse(simplejson.dumps({'res':True, 'ldt': {'id': ldt.id, 'state':ldt.state, 'ldt_id': ldt.ldt_id}}, ensure_ascii=False), mimetype='application/json')
 
 @login_required
-@group_security
 def unpublish(request, id, redirect=True):
     ldt = get_object_or_404(Project, ldt_id=id)
-    ldt.state = 1 #edition
-    ldt.save()
+    ldt.unpublish()
     redirect = boolean_convert(redirect)
     if redirect:
         return HttpResponseRedirect(reverse("ldt.ldt_utils.views.list_ldt"))
@@ -770,7 +761,6 @@
     return render_to_response('ldt/ldt_utils/create_ldt.html', {'form':form, 'contents':contents, 'create_project_action':reverse("ldt.ldt_utils.views.create_project", args=[iri_id]), 'target_parent':target_parent}, context_instance=RequestContext(request))
 
 @login_required
-@group_security
 def update_project(request, ldt_id):
 
     project = get_object_or_404(Project, ldt_id=ldt_id)
@@ -1139,7 +1129,6 @@
 
 
 @login_required
-@group_security
 def get_group_projects(request):
 
     # Get group, user and project_list