[marinemap] push by sfletche - a fine-tuning and some comments on the previous commit relate to featu... on 2011-10-05 00:01 GMT

[mari...@googlecode.com]

Revision: d2493c78b6f2
Author: sfle...@gmail.com
Date: Tue Oct 4 17:03:50 2011
Log: a fine-tuning and some comments on the previous commit relate to
feature saving and editing with m2m fields
http://code.google.com/p/marinemap/source/detail?r=d2493c78b6f2

Modified:
/lingcod/features/views.py

=======================================
--- /lingcod/features/views.py Tue Oct 4 13:07:51 2011
+++ /lingcod/features/views.py Tue Oct 4 17:03:50 2011
@@ -223,13 +223,20 @@
form = form_class(values, label_suffix='')
if form.is_valid():
m = form.save(commit=False)
+ '''
+ An explanation for the following save-related-code can be
found in the update method below (about 150 lines below)
+ where the same code appears for feature edits
+ '''
+ save_again = False
try:
m.save(rerun=False)
- form.save_m2m()
- m.save(rerun=True)
+ save_again = True
except TypeError:
m.save()
- form.save_m2m()
+ form.save_m2m()
+ if save_again:
+ m.save()
+
return to_response(
status=201,
location=m.get_absolute_url(),
@@ -364,13 +371,31 @@
form = form_class(values, instance=instance, label_suffix='')
if form.is_valid():
m = form.save(commit=False)
- try:
+ '''
+ The following save-related-code fixes the problem that
occurred when save called run before the m2m fields were saved.
+ In the case where there are many to many fields and analysis
to be run, we need to save an instance into the db,
+ then save the m2m fields, and then run the analysis.
+ In order to not break backward compatibility, the second save
(which is only called after save(rerun=False)) is called
+ without rerun=True. (This also allows the project developer
to determine rerun on a case-by-case basis.)
+
+ The resulting code will either perform the following (if
m.save allows a rerun keyword argument):
m.save(rerun=False)
+ form.save_m2m2()
+ m.save()
+ Or it will perform the following (if m.save does not allow a
rerun keyword argument):
+ m.save()
form.save_m2m()
- m.save(rerun=True)
+ '''
+ save_again = False
+ try:
+ m.save(rerun=False)
+ save_again = True
except TypeError:
m.save()
- form.save_m2m()
+ form.save_m2m()
+ if save_again:
+ m.save()
+
return to_response(
status=200,
select=m.uid,