Merge pull request #116 from go-to/master

コンテンツ取得時のチェック処理を修正

Controller/CircularNoticesController.php

@@ -191,7 +191,7 @@ public function view() {
 		// 回覧の閲覧件数／回答件数を取得
 		$counts = $this->CircularNoticeTargetUser->getCircularNoticeTargetUserCount($contentId);
 
-		// Paginator経由で回答先一覧を取得
+		// Paginator経由で回覧先一覧を取得
 		$this->Paginator->settings = $this->CircularNoticeTargetUser
 			->getCircularNoticeTargetUsersForPaginator($contentId, $this->params['named'], $userId);
 		$targetUsers = $this->Paginator->paginate('CircularNoticeTargetUser');
@@ -429,7 +429,7 @@ public function download() {
 			}
 			$contentId = $content['CircularNoticeContent']['id'];
 
-			// Paginator経由で回答先一覧を取得
+			// Paginator経由で回覧先一覧を取得
 			$this->Paginator->settings = $this->CircularNoticeTargetUser
 				->getCircularNoticeTargetUsersForPaginator($contentId, $this->params['named'], $userId, 0);
 			$targetUsers = $this->Paginator->paginate('CircularNoticeTargetUser');
@@ -500,7 +500,7 @@ private function __parseAnswer($replyType, $targetUser) {
 			case CircularNoticeComponent::CIRCULAR_NOTICE_CONTENT_REPLY_TYPE_MULTIPLE_SELECTION:
 				$selectionValues = explode(CircularNoticeComponent::SELECTION_VALUES_DELIMITER,
 					$targetUser['CircularNoticeTargetUser']['reply_selection_value']);
-				$answer = implode('、', $selectionValues);
+				$answer = implode(__d('circular_notices', 'Answer separator'), $selectionValues);
 				break;
 		}
 		return $answer;

Controller/Component/CircularNoticeComponent.php

@@ -132,7 +132,7 @@ class CircularNoticeComponent extends Component {
 	const EXPORT_COMPRESS_FILE_EXTENSION = '.zip';
 
 /**
- * 回答先のヘッダ項目を取得
+ * 回覧先のヘッダ項目を取得
  *
  * @return array
  */

Locale/jpn/LC_MESSAGES/circular_notices.po

@@ -15,87 +15,6 @@ msgstr ""
 "X-Generator: Poedit 1.7.5\n"
 "Language: ja\n"
 
-#: /View/CircularNotices/edit.ctp:4
-msgid "Edit Circular Notice"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:20 /View/CircularNotices/form.ctp:20
-msgid "Submit"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:23 /View/CircularNotices/form.ctp:23
-#: /View/CircularNotices/index.ctp:19;66
-msgid "Actions"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:26 /View/CircularNotices/form.ctp:26
-#: /View/CircularNotices/index.ctp:46
-msgid "Delete"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:26 /View/CircularNotices/form.ctp:26
-#: /View/CircularNotices/index.ctp:46
-msgid "Are you sure you want to delete # %s?"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:27 /View/CircularNotices/form.ctp:27
-msgid "List Circular Notices"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:28 /View/CircularNotices/form.ctp:28
-#: /View/CircularNotices/index.ctp:69
-msgid "List Blocks"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:29 /View/CircularNotices/form.ctp:29
-#: /View/CircularNotices/index.ctp:70
-msgid "New Block"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:30 /View/CircularNotices/form.ctp:30
-#: /View/CircularNotices/index.ctp:71
-msgid "List Users"
-msgstr ""
-
-#: /View/CircularNotices/edit.ctp:31 /View/CircularNotices/form.ctp:31
-#: /View/CircularNotices/index.ctp:72
-msgid "New Trackable Creator"
-msgstr ""
-
-#: /View/CircularNotices/form.ctp:4
-msgid "Form Circular Notice"
-msgstr ""
-
-#: /View/CircularNotices/index.ctp:2
-msgid "Circular Notices"
-msgstr ""
-
-#: /View/CircularNotices/index.ctp:44
-msgid "View"
-msgstr ""
-
-#: /View/CircularNotices/index.ctp:45
-msgid "Edit"
-msgstr ""
-
-#: /View/CircularNotices/index.ctp:54
-msgid ""
-"Page {:page} of {:pages}, showing {:current} records out of {:count} total, "
-"starting on record {:start}, ending on {:end}"
-msgstr ""
-
-#: /View/CircularNotices/index.ctp:59
-msgid "previous"
-msgstr ""
-
-#: /View/CircularNotices/index.ctp:61
-msgid "next"
-msgstr ""
-
-#: /View/CircularNotices/index.ctp:68
-msgid "New Circular Notice"
-msgstr ""
-
 # 回覧一覧画面の表示コンテンツ絞り込みに使用
 msgid "Display All Contents"
 msgstr "全てのステータス"
@@ -104,18 +23,10 @@ msgstr "全てのステータス"
 msgid "Display All Reply Status"
 msgstr "全ての回答状況"
 
-# 回覧一覧画面の表示コンテンツ絞り込みに使用
-msgid "Display Public Pending Contents"
-msgstr "承認待ち"
-
 # 回覧一覧画面の表示コンテンツ絞り込みに使用
 msgid "Display Draft During Contents"
 msgstr "一時保存"
 
-# 回覧一覧画面の表示コンテンツ絞り込みに使用
-msgid "Display Remand Contents"
-msgstr "差し戻し"
-
 # 回覧一覧画面の表示コンテンツ絞り込みに使用
 msgid "Display Reserved Contents"
 msgstr "公開前"
@@ -132,14 +43,6 @@ msgstr "回答受付終了"
 msgid "Display Closed Contents"
 msgstr "回覧終了"
 
-# 回覧一覧画面の表示コンテンツ絞り込みに使用
-msgid "Display Unread Contents"
-msgstr "未読"
-
-# 回覧一覧画面の表示コンテンツ絞り込みに使用
-msgid "Display Read Yet Contents"
-msgstr "既読"
-
 # 回覧一覧画面の表示コンテンツ絞り込みに使用
 msgid "Display Replied Contents"
 msgstr "回答済"
@@ -240,14 +143,6 @@ msgstr "選択肢"
 msgid "Reply Deadline"
 msgstr "回答期限"
 
-# 登録（編集）画面で使用
-msgid "Hour"
-msgstr "時"
-
-# 登録（編集）画面で使用
-msgid "Minute"
-msgstr "分"
-
 # 登録（編集）画面で使用
 msgid "Till"
 msgstr "～"
@@ -260,17 +155,10 @@ msgstr "設定しない"
 msgid "Set Deadline"
 msgstr "設定する"
 
-msgid "Plugin Name"
-msgstr "回覧板"
-
 # 参照画面で使用
 msgid "Created User Title"
 msgstr "作成者： "
 
-# 参照画面で使用
-msgid "Reply Type Title"
-msgstr "回答方式： "
-
 # 参照画面で使用
 msgid "Choices Title"
 msgstr "選択肢： "
@@ -283,17 +171,13 @@ msgstr "（回答数： %d ）"
 msgid "Answer Title"
 msgstr "回答： "
 
-# 参照画面で使用
-msgid "Do Answer"
-msgstr "回答する"
-
 # 参照画面で使用
 msgid "Change Answer"
 msgstr "回答修正"
 
 # 参照画面で使用
 msgid "Target User"
-msgstr "回答先"
+msgstr "回覧先"
 
 # 参照画面で使用
 msgid "Read Datetime"
@@ -311,10 +195,6 @@ msgstr "回答"
 msgid "Unreply"
 msgstr "未回答"
 
-# 参照画面で使用
-msgid "Back"
-msgstr "戻る"
-
 # 参照画面で使用
 msgid "Show Other Users"
 msgstr "回覧先一覧"
@@ -331,45 +211,15 @@ msgstr "回覧先CSV"
 msgid "Setting of password is required always to download answers."
 msgstr "回答データをダウンロードする場合は必ず圧縮パスワードの設定が必要です。"
 
-# 設定画面で使用
-msgid "Privilege Setting"
-msgstr "権限設定"
-
 # 表示方法変更画面で使用
 msgid "Show contents per page"
 msgstr "1ページに表示する回覧数"
 
-
-
 #: Plugins/CircularNotices/Model/CircularNoticeFrameSetting.php:
 #: Plugins/CircularNotices/Model/CircularNoticeTargetUser.php:
 msgid "%d items"
 msgstr "%d 件"
 
-#: Plugins/CircularNotices/View/Elements/CircularNotices/view_select_sort.ctp:
-msgid "Target User (Ascending)"
-msgstr "回答先順（昇順）"
-
-#: Plugins/CircularNotices/View/Elements/CircularNotices/view_select_sort.ctp:
-msgid "Target User (Descending)"
-msgstr "回答先順（降順）"
-
-#: Plugins/CircularNotices/View/Elements/CircularNotices/view_select_sort.ctp:
-msgid "Answer (Ascending)"
-msgstr "回答順（昇順）"
-
-#: Plugins/CircularNotices/View/Elements/CircularNotices/view_select_sort.ctp:
-msgid "Answer (Descending)"
-msgstr "回答順（降順）"
-
-#: Plugins/CircularNotices/View/Elements/CircularNotices/view_select_sort.ctp:
-msgid "Reply Datetime (Ascending)"
-msgstr "回答日時順（昇順）"
-
-#: Plugins/CircularNotices/View/Elements/CircularNotices/view_select_sort.ctp:
-msgid "Reply Datetime (Descending)"
-msgstr "回答日時順（降順）"
-
 #: Plugins/CircularNotices/View/Elements/CircularNotices/choice_edit_form.ctp:
 msgid "No choices"
 msgstr "選択肢が設定されていません"

Model/CircularNoticeContent.php

@@ -276,6 +276,9 @@ public function __construct($id = false, $table = null, $ds = null) {
  * @return mixed
  */
 	public function getCircularNoticeContent($key, $userId) {
+		if (empty($userId)) {
+			return false;
+		}
 		$this->__bindMyCircularNoticeTargetUser($userId, true);
 
 		return $this->find('first', array(

Test/Case/Model/CircularNoticeContent/GetCircularNoticeContentTest.php

@@ -53,23 +53,47 @@ class CircularNoticeContentGetCircularNoticeContentTest extends NetCommonsGetTes
  */
 	protected $_methodName = 'getCircularNoticeContent';
 
+/**
+ * getCircularNoticeContentのDataProvider
+ *
+ * ### 戻り値
+ *  - key CircularNoticeContentのkey
+ *  - userId ユーザID
+ *
+ * @return array
+ */
+	public function dataProvider() {
+		return array(
+			array(
+				'key' => 'circular_notice_content_1',
+				'userId' => '1',
+				'array'
+			),
+			array(
+				'key' => 'circular_notice_content_2',
+				'userId' => null,
+				'boolean',
+			),
+		);
+	}
+
 /**
  * getCircularNoticeContent()のテスト
  *
+ * @param string $key CircularNoticeContentのkey
+ * @param int $userId ユーザID
+ * @param array $expected 期待値
+ * @dataProvider dataProvider
  * @return void
  */
-	public function testGetCircularNoticeContent() {
+	public function testGetCircularNoticeContent($key, $userId, $expected) {
 		$model = $this->_modelName;
 		$methodName = $this->_methodName;
 
-		//データ生成
-		$key = null;
-		$userId = null;
-
 		//テスト実施
 		$result = $this->$model->$methodName($key, $userId);
 
 		//チェック
-		$this->assertNotEquals(false, $result);
+		$this->assertInternalType($expected, $result);
 	}
 }