Merge ccf4556 into 3aafd84

NetCommons3 · Dec 31, 2018 · ef3b719 · ef3b719
2 parents 3aafd84 + ccf4556
commit ef3b719
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git 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 {

diff --git 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);
 ?>
 
 <header>
 	<?php if ($topicFrameSetting['unit_type'] === TopicFrameSetting::UNIT_TYPE_DAYS) : ?>
-		<?php echo $this->DisplayNumber->dropDownToggleDays(array('currentDays' => $topicFrameSetting['display_days'])); ?>
+		<?php echo $this->DisplayNumber->dropDownToggleDays(array(
+			'currentDays' => $topicFrameSetting['display_days'],
+			'url' => $url
+		)); ?>
 	<?php else : ?>
-		<?php echo $this->DisplayNumber->dropDownToggle(array('currentLimit' => $topicFrameSetting['display_number'])); ?>
+		<?php echo $this->DisplayNumber->dropDownToggle(array(
+			'currentLimit' => $topicFrameSetting['display_number'],
+			'url' => $url
+		)); ?>
 	<?php endif; ?>
 
 	<?php if (Current::read('User.id')) : ?>

diff --git a/View/Elements/Topics/select_status.ctp b/View/Elements/Topics/select_status.ctp
@@ -18,7 +18,7 @@
 	<ul class="dropdown-menu" role="menu">
 		<?php foreach ($options as $key => $label) : ?>
 			<li>
-				<?php echo $this->Paginator->link($label, $url + ['status' => $key]); ?>
+				<?php echo $this->Paginator->link($label, array_merge($url, ['status' => $key])); ?>
 			</li>
 		<?php endforeach; ?>
 	</ul>

diff --git 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
@@ -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);