diff --git a/Controller/RegistrationAddController.php b/Controller/RegistrationAddController.php index c4ea62e..73b4a64 100644 --- a/Controller/RegistrationAddController.php +++ b/Controller/RegistrationAddController.php @@ -115,6 +115,7 @@ public function add() { // 過去データ 取り出し $conditions = Hash::remove($this->Registration->getBaseCondition(), 'block_id'); + unset($conditions['Registration.block_id']); $conditions['Block.room_id'] = Current::read('Room.id'); $pastRegistrations = $this->Registration->find('all', array( diff --git a/Model/ActionRegistrationAdd.php b/Model/ActionRegistrationAdd.php index 262346c..b630e0e 100644 --- a/Model/ActionRegistrationAdd.php +++ b/Model/ActionRegistrationAdd.php @@ -139,6 +139,7 @@ public function checkPastRegistration($check) { 'Registration.id' => $check['past_registration_id'] )); unset($baseCondition['block_id']); + unset($baseCondition['Registration.block_id']); $cnt = $this->Registration->find('count', array( 'conditions' => $baseCondition, 'recursive' => -1 @@ -258,11 +259,11 @@ protected function _getRegistrationCloneById($registrationId) { return $registration; } /** - * _copyWysiwygFiles - * + * _copyWysiwygFiles + * * 引数で指定された登録フォームの中を分析し、 * ウィジウィグに設定されているファイルは複製を作ります - * + * * @param array $registration 登録フォームデータ * @return array $registration 複製を作り終えた登録フォームデータ */