Merge pull request #1019 from jfunez/1018_fix_audit_log_new_objects

FIX: Bug On-line. #1018

Author: jamilatta

scielomanager/journalmanager/tests/tests_forms.py

@@ -2081,6 +2081,7 @@ def test_collections_field_must_only_display_collections_the_user_is_bound(self)
 
 
 class IssueBaseFormClassTests(unittest.TestCase):
+
     def test_basic_structure(self):
         issue_form = forms.IssueBaseForm()
 
@@ -3919,6 +3920,98 @@ def test_sections_must_not_be_trashed(self):
             self.assertRaises(ValueError,
                 lambda: form.set('section', str(trashed_section.pk)))
 
+    def test_ADD_issues_with_valid_form_and_invalid_formset_raise_validation_error(self):
+        """
+        TEST BUG #1018.
+        Is the form submitted, are valid, but, title formset is invalid, the submittion
+        must not raise any exception, only notify the wrong input message to user
+        """
+        perm_issue_change = _makePermission(perm='add_issue',
+            model='issue', app_label='journalmanager')
+        perm_issue_list = _makePermission(perm='list_issue',
+            model='issue', app_label='journalmanager')
+        self.user.user_permissions.add(perm_issue_change)
+        self.user.user_permissions.add(perm_issue_list)
+        for t in ['regular', 'supplement', 'special']:
+            form = self.app.get(reverse('issue.add_%s' % t,
+                args=[self.journal.pk]), user=self.user).forms['issue-form']
+
+            if t == 'supplement':
+                form['number'] = ''
+                form['volume'] = '29'
+                form['suppl_type'] = 'volume'
+                form['suppl_text'] = 'suppl.X'
+            elif t == 'special':
+                form['number'] = '3'
+                form['spe_type'] = 'number'
+                form['spe_text'] = 'X'
+            else: # regular
+                form['number'] = '3'
+                form['volume'] = '29'
+
+            form['total_documents'] = '16'
+            form.set('ctrl_vocabulary', 'nd')
+
+            form['publication_start_month'] = '9'
+            form['publication_end_month'] = '11'
+            form['publication_year'] = '2012'
+            form['is_marked_up'] = False
+            form['editorial_standard'] = 'other'
+            # inline title formset
+            form.set('title-0-language', '')
+            form.set('title-0-id', '')
+            form.set('title-0-title', 'La mexicanidad y el neoindianismo hoy')
+            response = form.submit()
+            self.assertTrue(response.context['add_form'].is_valid())
+            self.assertFalse(response.context['titleformset'].is_valid())
+            self.assertIn('There are some errors or missing data.', response.body)
+
+    def test_EDIT_issues_with_valid_form_and_invalid_formset_raise_validation_error(self):
+        """
+        TEST BUG #1018.
+        Is the form submitted, are valid, but, title formset is invalid, the submittion
+        must not raise any exception, only notify the wrong input message to user
+        """
+        perm_issue_change = _makePermission(perm='add_issue',
+            model='issue', app_label='journalmanager')
+        perm_issue_list = _makePermission(perm='list_issue',
+            model='issue', app_label='journalmanager')
+        self.user.user_permissions.add(perm_issue_change)
+        self.user.user_permissions.add(perm_issue_list)
+        for t in ['regular', 'supplement', 'special']:
+            issue = modelfactories.IssueFactory(journal=self.journal, suppl_text='', type=t)
+            form = self.app.get(reverse('issue.edit', args=[self.journal.pk, issue.pk]), user=self.user).forms['issue-form']
+
+            if t == 'supplement':
+                form['number'] = ''
+                form['volume'] = '29'
+                form['suppl_type'] = 'volume'
+                form['suppl_text'] = 'suppl.X'
+            elif t == 'special':
+                form['number'] = '3'
+                form['spe_type'] = 'number'
+                form['spe_text'] = 'X'
+            else: # regular
+                form['number'] = '3'
+                form['volume'] = '29'
+
+            form['total_documents'] = '16'
+            form.set('ctrl_vocabulary', 'nd')
+
+            form['publication_start_month'] = '9'
+            form['publication_end_month'] = '11'
+            form['publication_year'] = '2012'
+            form['is_marked_up'] = False
+            form['editorial_standard'] = 'other'
+            # inline title formset
+            form.set('title-0-language', '')
+            form.set('title-0-id', '')
+            form.set('title-0-title', 'La mexicanidad y el neoindianismo hoy')
+            response = form.submit()
+            self.assertTrue(response.context['add_form'].is_valid())
+            self.assertFalse(response.context['titleformset'].is_valid())
+            self.assertIn('There are some errors or missing data.', response.body)
+
 
 class SearchFormTests(WebTest):
 

scielomanager/journalmanager/views.py

@@ -434,7 +434,7 @@ def exclude_user_from_collection(request, user_id=None):
 
     if user_id:
         user = get_object_or_404(User, id=user_id)
-        
+
         collection.remove_user(user)
 
     return HttpResponseRedirect(reverse('user.index'))
@@ -829,7 +829,7 @@ def get_issue_form_by_type(issue_type, request, journal, instance):
 
         audit_old_values = helpers.collect_old_values(issue, form, [titleformset, ])
 
-        if form.is_valid():
+        if form.is_valid() and titleformset.is_valid():
             saved_issue = form.save(commit=False)
             saved_issue.journal = issue.journal
             saved_issue.save()
@@ -937,7 +937,7 @@ def get_issue_form_by_type(issue_type, request, journal, instance=None, initial=
         add_form = get_issue_form_by_type(issue_type, request, journal, instance=issue)
         titleformset = IssueTitleFormSet(request.POST, instance=issue, prefix='title')
 
-        if add_form.is_valid():
+        if add_form.is_valid() and titleformset.is_valid():
             saved_issue = add_form.save(commit=False)
             saved_issue.journal = journal
             saved_issue.type = issue_type