Merge remote-tracking branch 'origin/extend_acl_for_cd'

openprocurement · Aug 31, 2016 · 6299d8b · 6299d8b
2 parents a25438d + f6fa213
commit 6299d8b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/openprocurement/api/traversal.py b/src/openprocurement/api/traversal.py
@@ -25,6 +25,7 @@ class Root(object):
         (Allow, 'g:auction', 'auction'),
         (Allow, 'g:auction', 'upload_tender_documents'),
         (Allow, 'g:contracting', 'extract_credentials'),
+        (Allow, 'g:competitive_dialogue', 'create_tender'),
         (Allow, 'g:chronograph', 'edit_tender'),
         (Allow, 'g:Administrator', 'edit_tender'),
         (Allow, 'g:Administrator', 'edit_bid'),

diff --git a/src/openprocurement/api/utils.py b/src/openprocurement/api/utils.py
@@ -206,7 +206,8 @@ def get_revision_changes(dst, src):
 
 
 def set_ownership(item, request):
-    item.owner = request.authenticated_userid
+    if not item.get('owner'):
+        item.owner = request.authenticated_userid
     item.owner_token = generate_id()
 
 

diff --git a/src/openprocurement/api/views/tender.py b/src/openprocurement/api/views/tender.py
@@ -347,7 +347,8 @@ def post(self):
         tender_id = generate_id()
         tender = self.request.validated['tender']
         tender.id = tender_id
-        tender.tenderID = generate_tender_id(get_now(), self.db, self.server_id)
+        if not tender.get('tenderID'):
+            tender.tenderID = generate_tender_id(get_now(), self.db, self.server_id)
         if hasattr(tender, "initialize"):
             tender.initialize()
         if self.request.json_body['data'].get('status') == 'draft':