Removed old cancellation api

openprocurement · Feb 18, 2016 · 8f71f4f · 8f71f4f
1 parent 683def7
commit 8f71f4f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 11 deletions.
diff --git a/bootstrap.py b/bootstrap.py
diff --git a/docs.py b/docs.py
diff --git a/openprocurement/tender/limited/models.py b/openprocurement/tender/limited/models.py
@@ -6,7 +6,7 @@
 from schematics.types.serializable import serializable
 from openprocurement.api.models import (plain_role, view_role, create_role,
                                         edit_role, enquiries_role, listing_role,
-                                        cancel_role, Administrator_role,
+                                        Administrator_role,
                                         schematics_default_role,
                                         chronograph_role, chronograph_view_role)
 
@@ -48,7 +48,7 @@ class Options:
             'create': create_role,
             'edit': edit_role,
             'edit_active': edit_role,
-            'edit_active.awarded': cancel_role,
+            'edit_active.awarded': whitelist(),
             'edit_complete': whitelist(),
             'edit_unsuccessful': whitelist(),
             'edit_cancelled': whitelist(),

diff --git a/openprocurement/tender/limited/tests/tender.py b/openprocurement/tender/limited/tests/tender.py
@@ -538,11 +538,6 @@ def test_patch_tender(self):
 
         # The following operations are performed for a proper transition to the "Complete" tender status
 
-        response = self.app.patch_json('/tenders/{}?acc_token={}'.format(tender['id'], owner_token), {'data': {'status': 'complete'}}, status=403)
-        self.assertEqual(response.status, '403 Forbidden')
-        self.assertEqual(response.content_type, 'application/json')
-        self.assertEqual(response.json['errors'][0]["description"], "Can't update tender status")
-
         response = self.app.post_json('/tenders/{}/awards?acc_token={}'.format(
             tender['id'], owner_token), {'data': {'suppliers': [test_tender_data["procuringEntity"]], 'status': 'pending'}})
         award_id = response.json['data']['id']

diff --git a/openprocurement/tender/limited/views/tender.py b/openprocurement/tender/limited/views/tender.py
@@ -74,10 +74,6 @@ def patch(self):
             self.request.errors.status = 403
             return
         data = self.request.validated['data']
-        if self.request.authenticated_role == 'tender_owner' and 'status' in data and data['status'] not in ['cancelled', tender.status]:
-            self.request.errors.add('body', 'data', 'Can\'t update tender status')
-            self.request.errors.status = 403
-            return
         if self.request.authenticated_role == 'chronograph':
             self.request.errors.add('body', 'data', 'Chronograph has no power over me!')
             self.request.errors.status = 403