diff --git a/person.py b/person.py index 044ab00e1..747847787 100644 --- a/person.py +++ b/person.py @@ -578,9 +578,11 @@ def personUpgradeActor(baseDir: str, personJson: {}, if personJson.get('occupationName'): occupationName = personJson['occupationName'] del personJson['occupationName'] + updateActor = True if personJson.get('occupation'): occupationName = personJson['occupation'] del personJson['occupation'] + updateActor = True # if the older skills format is being used then switch # to the new one diff --git a/webapp_utils.py b/webapp_utils.py index 87c90edfc..b4d075108 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -722,10 +722,12 @@ def htmlHeaderWithPersonMarkup(cssFilename: str, instanceTitle: str, skillsMarkup = '' if actorJson.get('hasOccupation'): - skillsList = actorJson['hasOccupation']['skills'] + occupationStr = '' if actorJson['hasOccupation'].get('name'): occupationName = actorJson['hasOccupation']['name'] - occupationStr = ' "name": "' + occupationName + '",\n' + occupationStr += ' "name": "' + occupationName + '",\n' + skillsList = actorJson['hasOccupation']['skills'] + if skillsList: skillsMarkup = \ ' "hasOccupation": {\n' + \ ' "@type": "Occupation",\n' + \