Merged [4805] from rjsparks@nostrum.com:

When abandoning a chartering effort, only revert to approved charters if there's a chance one is there.
Fixes bug ietf-tools#868
 - Legacy-Id: 4917
Note: SVN reference [4805] has been migrated to Git commit 51426f1

Author: levkowetz

ietf/wgcharter/views.py

@@ -73,7 +73,7 @@ def change_state(request, name, option=None):
                 if "-" not in charter_rev:
                     charter_rev = charter_rev + "-00"
             elif option == "abandon":
-                if wg.state_id == "proposed":
+                if wg.state_id in ("proposed","bof","unknown"):
                     charter_state = State.objects.get(type="charter", slug="notrev")
                 else:
                     charter_state = State.objects.get(type="charter", slug="approved")