Merge pull request #208 from NetCommons3/ISSUE_862

Issue 862 時間切れで5.4,5.5,5.6がTravisエラーですが7,7.1が通っているのでOKとします
NetCommons3 · Nov 8, 2017 · 3c32a5e · 3c32a5e
2 parents a0afe4c + 505d478
commit 3c32a5e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,14 @@ php:
 sudo: false
 
 env:
-  - NETCOMMONS_VERSION=master DB=mysql
+  matrix:
+    - NETCOMMONS_VERSION=master DB=mysql
+  global:
+    - secure: "cb32rUp2l+Zd991n/6fY18wudLW0EjqqqlvxpKMWZOUaJ6dS5+R+IcoV5Oo94TNUEgzOQ/7Ldp5PW+qGg0S5EDyQOHtLp7kmmGy9ST7EL0QNyWyfSGXl9FUCqKd/fP3WZVx8ci6MgfUtj5DfamqjRctpJy4uQapbZwtUDQWweGY="
+    - GIT_COMMITTER_NAME=RikaFujiwara
+    - GIT_COMMITTER_EMAIL=rika.fujiwara@allcreator.net
+    - GIT_AUTHOR_NAME=RikaFujiwara
+    - GIT_AUTHOR_EMAIL=rika.fujiwara@allcreator.net
 
 before_script:
   - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3
@@ -21,7 +28,7 @@ before_script:
   - . tools/build/plugins/cakephp/travis/environment.sh
 
 script:
-  - travis_wait . tools/build/plugins/cakephp/travis/main.sh
+  - . tools/build/plugins/cakephp/travis/main.sh
 
 after_script:
   - . tools/build/plugins/cakephp/travis/post.sh

diff --git a/Controller/QuestionnaireBlocksController.php b/Controller/QuestionnaireBlocksController.php
@@ -44,6 +44,7 @@ class QuestionnaireBlocksController extends QuestionnairesAppController {
 	public $uses = array(
 		'Questionnaires.Questionnaire',
 		'Questionnaires.QuestionnaireFrameSetting',
+		'Questionnaires.QuestionnaireFrameDisplayQuestionnaire',
 		'Questionnaires.QuestionnaireAnswerSummary',
 		'Questionnaires.QuestionnaireAnswerSummaryCsv',
 		'Blocks.Block',
@@ -139,7 +140,16 @@ public function index() {
 			$this->view = 'not_found';
 			return;
 		}
-
+		$frame = $this->QuestionnaireFrameDisplayQuestionnaire->find('all', array(
+			'conditions' => array(
+				'frame_key' => Current::read('Frame.key'),
+			),
+			'recursive' => -1,
+		));
+		$frame = Hash::combine($frame,
+			'{n}.QuestionnaireFrameDisplayQuestionnaire.questionnaire_key',
+			'{n}.QuestionnaireFrameDisplayQuestionnaire.questionnaire_key');
+		$this->request->data['QuestionnaireFrameDisplayQuestionnaire'] = $frame;
 		$this->set('questionnaires', $questionnaire);
 	}
 

diff --git a/Test/Case/AllQuestionnairesTest.php b/Test/Case/AllQuestionnairesTest.php
@@ -17,7 +17,7 @@
  * @codeCoverageIgnore
  */
 
-class AllQuestionnairesTest extends CakeTestSuite {
+class AllQuestionnairesTest extends NetCommonsTestSuite {
 
 /**
  * All test suite

diff --git a/View/QuestionnaireBlocks/index.ctp b/View/QuestionnaireBlocks/index.ctp
@@ -55,7 +55,8 @@ echo $this->NetCommonsHtml->script(array(
 				</thead>
 				<tbody>
 					<?php foreach ((array)$questionnaires as $questionnaire) : ?>
-					<?php echo $this->BlockIndex->startTableRow($questionnaire['Questionnaire']['key']); ?>
+					<?php echo $this->BlockIndex->startTableRow($questionnaire['Questionnaire']['key'],
+						'QuestionnaireFrameDisplayQuestionnaire.' . $questionnaire['Questionnaire']['key']); ?>
 						<?php echo $this->BlockIndex->tableData(
 						'',
 						$this->QuestionnaireStatusLabel->statusLabelManagementWidget($questionnaire),