Mercurial Mercurial > renkan / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
server/python/django2/renkanmanager/serializers.py
changeset 608 8fd40139827c
parent 594 b45eb8244cd9
child 610 b9edc1c1538a 
--- a/server/python/django2/renkanmanager/serializers.py	Thu Apr 21 16:18:08 2016 +0200
+++ b/server/python/django2/renkanmanager/serializers.py	Mon Apr 11 16:28:05 2016 +0200
@@ -3,7 +3,6 @@
 
 from django.contrib.auth import get_user_model
 from django.conf import settings
-from guardian.shortcuts import assign_perm
 from renkanmanager.models import Renkan, Workspace, Revision
 from rest_framework import serializers
 
@@ -66,11 +65,6 @@
         ))
         initial_revision.save()
         renkan.save()
-        assign_perm('view_renkan', creator, renkan)
-        assign_perm('change_renkan', creator, renkan)
-        assign_perm('delete_renkan', creator, renkan)
-        assign_perm('view_revision', creator, initial_revision)
-        assign_perm('delete_revision', creator, initial_revision)
         return renkan
     
     def update(self, renkan, validated_data):
@@ -80,9 +74,8 @@
         updator = validated_data.get('updator')
         current_revision = Revision.objects.get(revision_guid=renkan.current_revision_guid)  
         if validated_data.get("create_new_revision", False):
-            revision_to_update = Revision.objects.create()
+            revision_to_update = Revision.objects.create(creator=updator)
             revision_to_update.parent_renkan_guid = renkan.renkan_guid
-            revision_to_update.creator = updator
             renkan.current_revision_guid = revision_to_update.revision_guid
         else:
             revision_to_update = current_revision
@@ -158,13 +151,9 @@
     
     def create(self, validated_data):
         creator = validated_data.get('creator')
-        workspace = Workspace.objects.create()
-        workspace.title = validated_data.get('title', '')
-        workspace.creator = creator
+        title = validated_data.get('title', '')
+        workspace = Workspace.objects.create(creator=creator, title=title)
         workspace.save()
-        assign_perm('view_workspace', creator, workspace)
-        assign_perm('change_workspace', creator, workspace)
-        assign_perm('delete_workspace', creator, workspace)
         return workspace
     
     def update(self, workspace, validated_data):
renkan