Luke Plant avatar Luke Plant committed 2a27b91

Moved 'update application form referee name' logic to model, to ensure it happens in all cases (e.g. in admin), not just for one view

Comments (0)

Files changed (2)

cciw/officers/models.py

         officer = self.reference_info.application.officer
         return u"Reference form for %s %s by %s" % (officer.first_name, officer.last_name, self.referee_name)
 
+    def save(self, *args, **kwargs):
+        retval = super(ReferenceForm, self).save(*args, **kwargs)
+        # Update application form with name of referee
+        ref_info = self.reference_info
+        app = ref_info.application
+        app.referees[ref_info.referee_number - 1].name = self.referee_name
+        app.save()
+        return retval
+
     class Meta:
         verbose_name = "Reference"
 

cciw/officers/views.py

                                    ("\nReference received via online system on %s\n" % \
                                     datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
                     ref.save()
-                    # Update application form with name of referee
-                    app = ref.application
-                    app.referees[ref.referee_number - 1].name = obj.referee_name
-                    app.save()
                     # Send e-mails
                     send_leaders_reference_email(obj)
                     return HttpResponseRedirect(reverse('cciw.officers.views.create_reference_thanks'))
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.