From 676c68a2439ca4225e064b5dca3e732674acb793 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Mon, 14 Jan 2019 11:46:27 -0500
Subject: [PATCH] fix test, minor python tweaks

---
 atst/routes/task_orders/new.py                  | 8 ++++----
 tests/routes/task_orders/test_new_task_order.py | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py
index 8835e7c5..fba36ac7 100644
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -126,9 +126,9 @@ class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
 
         # don't save other text in DB unless "other" is checked
         if "complexity" in to_data and "other" not in to_data["complexity"]:
-            to_data["complexity_other"] = ""
+            to_data["complexity_other"] = None
         if "dev_team" in to_data and "other" not in to_data["dev_team"]:
-            to_data["dev_team_other"] = ""
+            to_data["dev_team_other"] = None
 
         return to_data
 
@@ -139,8 +139,8 @@ class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
         if self.task_order:
             if "portfolio_name" in self.form.data:
                 new_name = self.form.data["portfolio_name"]
-                old_name = self.task_order.to_dictionary()["portfolio_name"]
-                if not new_name is old_name:
+                old_name = self.task_order.portfolio_name
+                if not new_name == old_name:
                     Portfolios.update(self.task_order.portfolio, {"name": new_name})
             TaskOrders.update(self.user, self.task_order, **self.task_order_form_data)
         else:
diff --git a/tests/routes/task_orders/test_new_task_order.py b/tests/routes/task_orders/test_new_task_order.py
index 77ed8dc5..672bace0 100644
--- a/tests/routes/task_orders/test_new_task_order.py
+++ b/tests/routes/task_orders/test_new_task_order.py
@@ -165,13 +165,14 @@ def test_update_task_order_with_existing_task_order(task_order):
 def test_other_text_not_saved_if_other_not_checked(task_order):
     to_data = {
         **TaskOrderFactory.dictionary(),
-        "complexity": ["conus", "other"],
+        "complexity": ["conus"],
         "complexity_other": "quite complex",
     }
     workflow = UpdateTaskOrderWorkflow(
         task_order.creator, to_data, task_order_id=task_order.id
     )
     workflow.update()
+    assert not workflow.task_order.complexity_other
 
 
 def test_invite_officers_to_task_order(task_order, queue):