Replaced direct assignment to m2m fields with .clear() and .set()

- Legacy-Id: 14666
This commit is contained in:
Henrik Levkowetz 2018-02-21 23:58:25 +00:00
parent 36b5e2ef8e
commit 26bf387356
9 changed files with 21 additions and 16 deletions

View file

@ -72,7 +72,7 @@ def reset_name_contains_index_for_rule(rule):
if not rule.rule_type == "name_contains":
return
rule.name_contains_index = Document.objects.filter(docalias__name__regex=rule.text)
rule.name_contains_index.set(Document.objects.filter(docalias__name__regex=rule.text))
def update_name_contains_indexes_with_new_doc(doc):
for r in SearchRule.objects.filter(rule_type="name_contains"):

View file

@ -1274,7 +1274,7 @@ class AdoptDraftTests(TestCase):
class ChangeStreamStateTests(TestCase):
def test_set_tags(self):
draft = make_test_data()
draft.tags = DocTagName.objects.filter(slug="w-expert")
draft.tags.set(DocTagName.objects.filter(slug="w-expert"))
draft.group.unused_tags.add("w-refdoc")
url = urlreverse('ietf.doc.views_draft.change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf"))

View file

@ -1230,8 +1230,8 @@ def request_publication(request, name):
m.save()
if doc.group.acronym != "none":
m.related_groups = [doc.group]
m.related_docs = [doc]
m.related_groups.set([doc.group])
m.related_docs.set([doc])
send_mail_message(request, m)
@ -1514,7 +1514,8 @@ def change_stream_state(request, name, state_type):
new_tags = set(form.cleaned_data["tags"])
if existing_tags != new_tags:
doc.tags = new_tags
doc.tags.clear()
doc.tags.set(new_tags)
e = DocEvent(type="changed_document", doc=doc, rev=doc.rev, by=by)
added_tags = new_tags - existing_tags

View file

@ -226,8 +226,9 @@ def edit_milestones(request, acronym, group_type=None, milestone_set="current"):
if not history:
history = save_milestone_in_history(m)
m.docs = new_docs
m.docs.clear()
m.docs.set(new_docs)
if len(changes) > 1:
m.save()
@ -239,7 +240,7 @@ def edit_milestones(request, acronym, group_type=None, milestone_set="current"):
set_attributes_from_form(f, m)
m.save()
m.docs = c["docs"]
m.docs.set(c["docs"])
named_milestone = 'milestone "%s"' % m.desc
if milestone_set == "charter":
@ -366,7 +367,8 @@ def reset_charter_milestones(request, group_type, acronym):
due=m.due,
resolved=m.resolved,
)
new.docs = m.docs.all()
new.docs.clear()
new.docs.set(m.docs.all())
DocEvent.objects.create(type="changed_charter_milestone",
doc=group.charter,

View file

@ -774,7 +774,7 @@ class MilestoneTests(TestCase):
due=datetime.date.today(),
resolved="",
state_id="active")
m1.docs = [draft]
m1.docs.set([draft])
m2 = GroupMilestone.objects.create(id=2,
group=group,
@ -782,7 +782,7 @@ class MilestoneTests(TestCase):
due=datetime.date.today(),
resolved="",
state_id="charter")
m2.docs = [draft]
m2.docs.set([draft])
return (m1, m2, group)

View file

@ -264,7 +264,7 @@ def confirm(request, acronym):
)
session_save(new_session)
if 'resources' in form.data:
new_session.resources = session_data['resources']
new_session.resources.set(session_data['resources'])
# write constraint records
save_conflicts(group,meeting,form.data.get('conflict1',''),'conflict')

View file

@ -264,7 +264,7 @@ def post_submission(request, submission, approvedDesc):
update_authors(draft, submission)
draft.formal_languages = submission.formal_languages.all()
draft.formal_languages.set(submission.formal_languages.all())
trouble = rebuild_reference_relations(draft, filename=os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (submission.name, submission.rev)))
if trouble:
@ -691,7 +691,7 @@ def fill_in_submission(form, submission, authors, abstract, file_size):
submission.save()
submission.formal_languages = FormalLanguageName.objects.filter(slug__in=form.parsed_draft.get_formal_languages())
submission.formal_languages.set(FormalLanguageName.objects.filter(slug__in=form.parsed_draft.get_formal_languages()))
def apply_checkers(submission, file_name):
# run submission checkers

View file

@ -395,7 +395,8 @@ def edit_submission(request, submission_id, access_token=None):
formal_languages_changed = False
if set(submission.formal_languages.all()) != set(edit_form.cleaned_data["formal_languages"]):
submission.formal_languages = edit_form.cleaned_data["formal_languages"]
submission.formal_languages.clear()
submission.formal_languages.set(edit_form.cleaned_data["formal_languages"])
formal_languages_changed = True
send_manual_post_request(request, submission, errors)

View file

@ -196,7 +196,8 @@ def update_drafts_from_queue(drafts):
t = DocTagName.objects.filter(slug__in=tags)
if set(t) != set(d.tags.all()):
d.tags = t
d.tags.clear()
d.tags.set(t)
changed.add(name)
if events: