From 588f7a6df8ab1a8d502fefdec0846311fefaeef1 Mon Sep 17 00:00:00 2001 From: Min-Soo Kim Date: Wed, 17 Jun 2020 21:29:08 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(=EB=AF=B8=EC=84=B8=20=EC=88=98=EC=A0=95)?= =?UTF-8?q?=20(#1320)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #1308 에 대한 추가 수정입니다. --- modules/editor/skins/ckeditor/css/default.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/editor/skins/ckeditor/css/default.less b/modules/editor/skins/ckeditor/css/default.less index b5dbebed3..2ee58cfa3 100644 --- a/modules/editor/skins/ckeditor/css/default.less +++ b/modules/editor/skins/ckeditor/css/default.less @@ -49,9 +49,10 @@ html { &.cke_panel_container, &.cke_panel_container body { - background-color: #fff; + .light_dark(default); } body.cke_editable { + min-height: 100vh; padding: 10px; .light_dark(@colorset); } From 83ce4a8099f31393dbe49433852fdbb698a77c84 Mon Sep 17 00:00:00 2001 From: Min-Soo Kim Date: Wed, 17 Jun 2020 23:00:14 +0900 Subject: [PATCH 2/4] Countable or not, in communication view. (#1321) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 커뮤니케이션 모듈 내용 중 null 이 반환되는 가능성이 있는 부분 예외 상황 대응 https://github.com/rhymix/rhymix/pull/1309 연관 --- modules/communication/communication.view.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index 32416441b..06f175cea 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -294,12 +294,16 @@ class communicationView extends communication $oCommunicationModel = getModel('communication'); // get a group list + $friend_group_list = array(); $tmp_group_list = $oCommunicationModel->getFriendGroups(); - $group_count = count($tmp_group_list); - - for($i = 0; $i < $group_count; $i++) + if (is_countable($tmp_group_list)) { - $friend_group_list[$tmp_group_list[$i]->friend_group_srl] = $tmp_group_list[$i]; + $group_count = count($tmp_group_list); + + for($i = 0; $i < $group_count; $i++) + { + $friend_group_list[$tmp_group_list[$i]->friend_group_srl] = $tmp_group_list[$i]; + } } Context::set('friend_group_list', $friend_group_list); @@ -381,6 +385,10 @@ class communicationView extends communication // get a group list $friend_group_list = $oCommunicationModel->getFriendGroups(); + if(!is_countable($friend_group_list)) + { + $friend_group_list = array(); + } Context::set('friend_group_list', $friend_group_list); $this->setTemplateFile('add_friend'); From c164f506bbc72af9d5ba5507065e51f6c31ef5cd Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 18 Jun 2020 12:14:52 +0900 Subject: [PATCH 3/4] Fix #1324 extra_vars not saved when editing widget page --- modules/module/module.controller.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 3d1fde749..531b97ccb 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -967,9 +967,8 @@ class moduleController extends module { $this->deleteModuleExtraVars($module_srl); getDestroyXeVars($obj); - if(!$obj || !is_countable($obj) || !count($obj)) return; - - foreach($obj as $key => $val) + + foreach(get_object_vars($obj) as $key => $val) { if(is_object($val) || is_array($val)) continue; From 8ab971f6966edfc0f9ea173028987ecc5b068555 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 18 Jun 2020 13:10:32 +0900 Subject: [PATCH 4/4] Improve #1321 --- modules/communication/communication.model.php | 11 ++++------- modules/communication/communication.view.php | 17 +---------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/modules/communication/communication.model.php b/modules/communication/communication.model.php index 5cc34f982..6a93ba070 100644 --- a/modules/communication/communication.model.php +++ b/modules/communication/communication.model.php @@ -378,16 +378,13 @@ class communicationModel extends communication $args = new stdClass(); $args->member_srl = $logged_info->member_srl; - $output = executeQueryArray('communication.getFriendGroups', $args); - - $group_list = $output->data; - if(!$group_list) + $friend_group_list = array(); + foreach ($output->data as $item) { - return; + $friend_group_list[$item->friend_group_srl] = $item; } - - return $group_list; + return $friend_group_list; } /** diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index 06f175cea..e24b7a58e 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -294,18 +294,7 @@ class communicationView extends communication $oCommunicationModel = getModel('communication'); // get a group list - $friend_group_list = array(); - $tmp_group_list = $oCommunicationModel->getFriendGroups(); - if (is_countable($tmp_group_list)) - { - $group_count = count($tmp_group_list); - - for($i = 0; $i < $group_count; $i++) - { - $friend_group_list[$tmp_group_list[$i]->friend_group_srl] = $tmp_group_list[$i]; - } - } - + $friend_group_list = $oCommunicationModel->getFriendGroups(); Context::set('friend_group_list', $friend_group_list); // get a list of friends @@ -385,10 +374,6 @@ class communicationView extends communication // get a group list $friend_group_list = $oCommunicationModel->getFriendGroups(); - if(!is_countable($friend_group_list)) - { - $friend_group_list = array(); - } Context::set('friend_group_list', $friend_group_list); $this->setTemplateFile('add_friend');