Merge remote-tracking branch 'origin/fix_lot_creation_validation' int…

…o dev
openprocurement · Nov 9, 2016 · 5f71a6f · 5f71a6f
2 parents 1c0d7f1 + 48bdc12
commit 5f71a6f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/openprocurement/tender/limited/tests/award.py b/openprocurement/tender/limited/tests/award.py
@@ -1065,6 +1065,8 @@ def test_two_lot_two_awards(self):
         self.assertEqual(response.json['errors'][0]["description"],
                          "Can't create new award on lot while any (pending) award exists")
 
+        lots = self.app.get('/tenders/{}/lots?acc_token{}'.format(self.tender_id, self.tender_token)).json['data']
+
         # try create another lot
         response = self.app.post_json('/tenders/{}/lots?acc_token={}'.format(self.tender_id, self.tender_token),
                                       {'data': test_lots[0]},
@@ -1074,6 +1076,10 @@ def test_two_lot_two_awards(self):
         self.assertEqual(response.json['errors'][0]["description"],
                          "Can't add lot when you have awards")
 
+        response = self.app.get('/tenders/{}/lots?acc_token={}'.format(self.tender_id, self.tender_token))
+
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(len(response.json['data']), len(lots))
 
 
 class TenderNegotiationQuickAwardResourceTest(TenderNegotiationAwardResourceTest):

diff --git a/openprocurement/tender/limited/views/lot.py b/openprocurement/tender/limited/views/lot.py
@@ -35,6 +35,7 @@ def validate_update_tender(self, operation):
             self.request.errors.add('body', 'data', 'Can\'t {} lot when you have awards'.format(
                 operation, tender.status))
             self.request.errors.status = 403
+            return
         return True
 
     @json_view(content_type="application/json", validators=(validate_lot_data,), permission='edit_tender')