Skip to content

Commit

Permalink
handle translated name and headline both
Browse files Browse the repository at this point in the history
  • Loading branch information
devketanpro committed Nov 8, 2023
1 parent 53d86d2 commit 3a8dee7
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions server/planning/planning/planning.py
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,9 @@ def _create_update_assignment(
if entry["language"] == doc.get("planning", {}).get("language")
}
)

translated_name = translated_value.get("name", translated_value.get("headline"))

doc["planning"].update(
{
key: val
Expand All @@ -761,8 +764,8 @@ def _create_update_assignment(
if assigned_to.get("state") and assigned_to["state"] != ASSIGNMENT_WORKFLOW_STATE.DRAFT:
assign_state = assigned_to.get("state")

if translated_value.get("name") and "headline" not in doc["planning"]:
doc["planning"]["headline"] = translated_value.get("name")
if translated_value and translated_name and "headline" not in doc["planning"]:
doc["planning"]["headline"] = translated_name

assignment = {
"assigned_to": {
Expand All @@ -777,8 +780,8 @@ def _create_update_assignment(
"priority": assigned_to.get("priority", DEFAULT_ASSIGNMENT_PRIORITY),
"description_text": planning.get("description_text"),
}
if translated_value.get("name") and assignment.get("name") != translated_value.get("name"):
assignment["name"] = translated_value.get("name")
if translated_value and translated_name and assignment.get("name") != translated_value.get("name"):
assignment["name"] = translated_name

if doc.get("scheduled_update_id"):
assignment["scheduled_update_id"] = doc["scheduled_update_id"]
Expand Down Expand Up @@ -869,7 +872,7 @@ def _create_update_assignment(

# If the Planning name has been changed
if planning_original.get("name") != planning_updates.get("name"):
assignment["name"] = planning["name"] if not translated_value.get("name") else translated_value["name"]
assignment["name"] = planning["name"] if not translated_value and translated_name else translated_name

# If there has been a change in the planning internal note then notify the assigned users/desk
if planning_updates.get("internal_note") and planning_original.get("internal_note") != planning_updates.get(
Expand Down

0 comments on commit 3a8dee7

Please sign in to comment.