From a1457aeebb80d36f8bb7cf7cd9eb3e7dd106a72d Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Mon, 31 Dec 2018 15:42:02 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E3=83=AB=E3=83=BC=E3=83=A0=E6=AF=8E?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E7=A4=BA=EF=BC=9A=E8=A1=A8=E7=A4=BA=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Topics/json/index_plugins.ctp | 2 +- View/Topics/json/index_rooms.ctp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/View/Topics/json/index_plugins.ctp b/View/Topics/json/index_plugins.ctp index 5d73e46..8d2f899 100644 --- a/View/Topics/json/index_plugins.ctp +++ b/View/Topics/json/index_plugins.ctp @@ -14,4 +14,4 @@ $pluginKey = $this->request->query['plugin_key']; echo $this->NetCommonsHtml->json(array( 'paging' => $topics[$pluginKey]['paging'], 'topics' => $this->Topics->camelizeKeyRecursive($topics[$pluginKey]['topics']) -)); +), 'OK', 200, false); diff --git a/View/Topics/json/index_rooms.ctp b/View/Topics/json/index_rooms.ctp index aee86e9..0fd667a 100644 --- a/View/Topics/json/index_rooms.ctp +++ b/View/Topics/json/index_rooms.ctp @@ -14,4 +14,4 @@ $roomId = $this->request->query['room_id']; echo $this->NetCommonsHtml->json(array( 'paging' => $topics[$roomId]['paging'], 'topics' => $this->Topics->camelizeKeyRecursive($topics[$roomId]['topics']) -)); +), 'OK', 200, false); From 3d39fa6198930de780df49ce4c58e8a6a6d700b0 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Mon, 31 Dec 2018 16:50:36 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=96=B0=E7=9D=80=E3=81=A7=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E4=BB=B6=E6=95=B0=E3=82=92=E5=A4=89=E6=9B=B4=E3=80=81?= =?UTF-8?q?=E6=97=A5=E6=95=B0=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E5=AF=BE=E5=BF=9C=20https://github.?= =?UTF-8?q?com/NetCommons3/NetCommons3/issues/1253=20=E6=97=A5=E6=95=B0?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=AE=E6=97=A5=E6=95=B0=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E5=BE=8C=E3=80=81Undefined=20index=E5=AF=BE=E5=BF=9C=20https:/?= =?UTF-8?q?/github.com/NetCommons3/NetCommons3/issues/1410?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Elements/Topics/header.ctp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/View/Elements/Topics/header.ctp b/View/Elements/Topics/header.ctp index 057fd67..6c08f3f 100644 --- a/View/Elements/Topics/header.ctp +++ b/View/Elements/Topics/header.ctp @@ -8,13 +8,22 @@ * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project */ +$named = $this->Paginator->params['named']; +$named['page'] = '1'; +$url = NetCommonsUrl::blockUrl($named); ?>
- DisplayNumber->dropDownToggleDays(array('currentDays' => $topicFrameSetting['display_days'])); ?> + DisplayNumber->dropDownToggleDays(array( + 'currentDays' => $topicFrameSetting['display_days'], + 'url' => $url + )); ?> - DisplayNumber->dropDownToggle(array('currentLimit' => $topicFrameSetting['display_number'])); ?> + DisplayNumber->dropDownToggle(array( + 'currentLimit' => $topicFrameSetting['display_number'], + 'url' => $url + )); ?> From c0ee1b8191d8d8dcaafc9427f1b1ca75d86ecd6d Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Mon, 31 Dec 2018 17:09:29 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=96=B0=E7=9D=80=E3=81=A7=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=82=B9=E3=83=86=E3=83=BC=E3=82=BF=E3=82=B9=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E5=BE=8C=E3=80=81=E5=86=8D=E5=A4=89=E6=9B=B4=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E3=81=AB=E3=81=99=E3=82=8B=20https://github.com/NetCo?= =?UTF-8?q?mmons3/NetCommons3/issues/1410?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Elements/Topics/select_status.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/View/Elements/Topics/select_status.ctp b/View/Elements/Topics/select_status.ctp index f155f9b..36428e3 100644 --- a/View/Elements/Topics/select_status.ctp +++ b/View/Elements/Topics/select_status.ctp @@ -18,7 +18,7 @@ From ccf4556cafcbf651ba1db1365cfa9873f2d89582 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Mon, 31 Dec 2018 18:04:37 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E3=83=97=E3=83=A9=E3=82=B0=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E6=AF=8E=E3=81=AB=E8=A1=A8=E7=A4=BA&=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=81=97=E3=81=9F=E3=83=97=E3=83=A9=E3=82=B0=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E3=81=BF=E8=A1=A8=E7=A4=BA=E3=81=AE=E6=99=82?= =?UTF-8?q?=E3=80=81=E3=80=8C=E3=82=82=E3=81=A3=E3=81=A8=E8=A6=8B=E3=82=8B?= =?UTF-8?q?=E3=80=8D=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20https://github.com/NetCommons3/NetCommons3?= =?UTF-8?q?/issues/1186?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/TopicFramesPlugin.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Model/TopicFramesPlugin.php b/Model/TopicFramesPlugin.php index 57f6ab3..137d901 100644 --- a/Model/TopicFramesPlugin.php +++ b/Model/TopicFramesPlugin.php @@ -126,12 +126,14 @@ public function getPlugins($topicFrameSetting, $conditions = []) { ) ), true); + $conditions = Hash::merge( + array($this->alias . '.frame_key' => Current::read('Frame.key')), + $conditions + ); $plugin = $this->find('list', array( 'recursive' => 0, 'fields' => array('Plugin.key', 'Plugin.name'), - 'conditions' => array( - $this->alias . '.frame_key' => Current::read('Frame.key'), - ), + 'conditions' => $conditions, 'order' => 'weight' )); } else {