From 232cafaa8fc393ad0086618b75b63553e6437f4d Mon Sep 17 00:00:00 2001
From: Fabien 'egg' O'Carroll <fabien@allou.is>
Date: Mon, 28 Sep 2020 16:20:53 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20tag=20metadata=20fields?=
 =?UTF-8?q?=20not=20being=20populated=20when=20editing=20in=20admin=20(#17?=
 =?UTF-8?q?14)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #12190

The "scratch" concept was being used incorrectly for codeinjection fields and was not initialised with all the required fields.
---
 app/components/gh-tag-settings-form.hbs | 12 ++++++------
 app/controllers/tag.js                  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/components/gh-tag-settings-form.hbs b/app/components/gh-tag-settings-form.hbs
index 22c6b87bc..f1cf3e733 100644
--- a/app/components/gh-tag-settings-form.hbs
+++ b/app/components/gh-tag-settings-form.hbs
@@ -316,26 +316,26 @@
         <div class="mt6 flex flex-column flex-row-ns flex-wrap items-start justify-between">
             <GhFormGroup @class="settings-code" @errors={{this.tag.errors}} @hasValidated={{this.tag.hasValidated}} @property="codeinjectionHead">
                 <label for="codeinjection-head" class="gh-tag-setting-codeheader">Tag header <code class="fw4 ml1">\{{ghost_head}}</code></label>
-                <GhCmEditor @value={{this.codeinjectionHeadScratch}}
+                <GhCmEditor @value={{this.scratchTag.codeinjectionHead}}
                     @id="tag-setting-codeinjection-head"
                     @class="gh-tag-setting-codeinjection"
                     @name="tag-setting-codeinjection-head"
-                    @focusOut={{action "setProperty" "codeinjectionHead" this.codeinjectionHeadScratch}}
+                    @focusOut={{action "setProperty" "codeinjectionHead" this.scratchTag.codeinjectionHead}}
                     @stopEnterKeyDownPropagation="true"
-                    @update={{action (mut this.codeinjectionHeadScratch)}}
+                    @update={{action (mut this.scratchTag.codeinjectionHead)}}
                 />
                 <GhErrorMessage @errors={{this.tag.errors}} @property="codeinjectionHead"/>
             </GhFormGroup>
 
             <GhFormGroup @class="settings-code" @errors={{this.tag.errors}} @hasValidated={{this.tag.hasValidated}} @property="codeinjectionFoot">
                 <label for="codeinjection-foot"class="gh-tag-setting-codeheader">Tag footer <code class="fw4 ml1">\{{ghost_foot}}</code></label>
-                <GhCmEditor @value={{this.codeinjectionfootScratch}}
+                <GhCmEditor @value={{this.scratchTag.codeinjectionFoot}}
                     @id="tag-setting-codeinjection-foot"
                     @class="gh-tag-setting-codeinjection"
                     @name="tag-setting-codeinjection-foot"
-                    @focusOut={{action "setProperty" "codeinjectionFoot" this.codeinjectionFootScratch}}
+                    @focusOut={{action "setProperty" "codeinjectionFoot" this.scratchTag.codeinjectionFoot}}
                     @stopEnterKeyDownPropagation="true"
-                    @update={{action (mut this.codeinjectionFootScratch)}}
+                    @update={{action (mut this.scratchTag.codeinjectionFoot)}}
                 />
                 <GhErrorMessage @errors={{this.tag.errors}} @property="codeinjectionFoot"/>
             </GhFormGroup>
diff --git a/app/controllers/tag.js b/app/controllers/tag.js
index 2b93beb4c..6ae257319 100644
--- a/app/controllers/tag.js
+++ b/app/controllers/tag.js
@@ -7,7 +7,7 @@ import {inject as service} from '@ember/service';
 import {slugify} from '@tryghost/string';
 import {task} from 'ember-concurrency';
 
-const SCRATCH_PROPS = ['name', 'slug', 'description', 'metaTitle', 'metaDescription'];
+const SCRATCH_PROPS = ['name', 'slug', 'description', 'metaTitle', 'metaDescription', 'ogTitle', 'ogDescription', 'twitterTitle', 'twitterDescription', 'codeinjectionHead', 'codeinjectionFoot'];
 
 export default Controller.extend({
     notifications: service(),