Correct bug in saving EICRecommendation

submissions/templates/submissions/submission_detail.html

@@ -86,7 +86,8 @@
   <div id="invitedreportslist">
     {% for report in invited_reports %}
     <hr class="hr6"/>
-    {% if user|is_in_group:'Editorial College' and not is_author and not is_author_unchecked %}
+<!--    {% if user|is_in_group:'Editorial College' and not is_author and not is_author_unchecked %} -->
+    {% if user.contributor == submission.editor_in_charge %}
     {% if report.flagged %}
     <h4 style="color: red">CAUTION: check if this referee has been flagged by the authors</h4>
     {% endif %}

submissions/views.py

@@ -741,9 +741,15 @@ def eic_recommendation(request, submission_id):
     if request.method == 'POST':
         form = EICRecommendationForm(request.POST)
         if form.is_valid():
-            recommendation = form.save()
-            recommendation.submission = submission
-            recommendation.date_submitted = timezone.now()
+            #recommendation = form.save()
+            recommendation = EICRecommendation(
+                submission = submission,
+                date_submitted = timezone.now(),
+                remarks_for_authors = form.cleaned_data['remarks_for_authors'],
+                requested_changes = form.cleaned_data['requested_changes'],
+                remarks_for_editorial_college = form.cleaned_data['remarks_for_editorial_college'],
+            )
+            recommendation.recommendation = form.cleaned_data['recommendation']
             recommendation.voting_deadline = timezone.now() + datetime.timedelta(days=7)
             recommendation.save()
             # If recommendation is to accept or reject,