From 8dd6c478a9765f6c395ec7d4f3ccccaa0eecbee2 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 16 Nov 2021 16:47:56 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E3=80=8C=E7=89=B9=E5=AE=9A=E3=81=AE?=
 =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=A0=E3=81=AE=E7=89=B9=E5=AE=9A=E3=81=AE?=
 =?UTF-8?q?=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E3=82=92=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=80=8D=E3=81=8C=E5=86=8D=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=81=A8=E3=81=8D=E6=AD=A3=E3=81=97=E3=81=8F=E3=83=96=E3=83=AD?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=81=8C=E9=81=B8=E6=8A=9E=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=20https://github.com/NetCommons3/NetCommons3?=
 =?UTF-8?q?/issues/1671?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/js/topics.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webroot/js/topics.js b/webroot/js/topics.js
index 7658412..64afffe 100644
--- a/webroot/js/topics.js
+++ b/webroot/js/topics.js
@@ -29,6 +29,7 @@ NetCommonsApp.controller('TopicSettingsController', ['$scope', function($scope)
   $scope.initBlocks = function(blocks, topicFramesBlock) {
     $scope.blocks = blocks;
     $scope.topicFramesBlock = topicFramesBlock['topicFramesBlock'];
+		$scope.blockKey = $scope.topicFramesBlock.blockKey;
   };
 
   /**
@@ -41,7 +42,7 @@ NetCommonsApp.controller('TopicSettingsController', ['$scope', function($scope)
 
     if (angular.isDefined($scope.blocks[pluginKey])) {
       if (angular.isDefined($scope.blocks[pluginKey][$scope.blockKey])) {
-        var blockKey = $scope.topicFramesBlock.blockKey;
+        var blockKey = $scope.blockKey;
       } else {
         var blockKey = null;
         angular.forEach($scope.blocks[pluginKey], function(value, key) {

From f349c151a7af1f2ed76cadabd9daa7f6baf0022c Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 16 Nov 2021 17:24:42 +0900
Subject: [PATCH 2/2] =?UTF-8?q?test:=20gjslint=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20https://github.com/NetCommons3/NetCommons3?=
 =?UTF-8?q?/issues/1671?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/js/topics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/js/topics.js b/webroot/js/topics.js
index 64afffe..c47a92b 100644
--- a/webroot/js/topics.js
+++ b/webroot/js/topics.js
@@ -29,7 +29,7 @@ NetCommonsApp.controller('TopicSettingsController', ['$scope', function($scope)
   $scope.initBlocks = function(blocks, topicFramesBlock) {
     $scope.blocks = blocks;
     $scope.topicFramesBlock = topicFramesBlock['topicFramesBlock'];
-		$scope.blockKey = $scope.topicFramesBlock.blockKey;
+    $scope.blockKey = $scope.topicFramesBlock.blockKey;
   };
 
   /**